From b91b3c76241e429e10852a8a61445057a1a80a52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Fri, 9 Nov 2018 20:47:39 +0100 Subject: [PATCH] Version 18.14 --- Makefile | 4 +- swad_ID.c | 17 +-- swad_MFU.c | 19 ++-- swad_account.c | 25 ++--- swad_action.c | 250 -------------------------------------------- swad_action.h | 28 ----- swad_agenda.c | 31 +++--- swad_alert.c | 11 +- swad_announcement.c | 9 +- swad_assignment.c | 24 +++-- swad_attendance.c | 49 ++++----- swad_banner.c | 39 +++---- swad_box.c | 5 +- swad_calendar.c | 17 +-- swad_centre.c | 85 +++++++-------- swad_changelog.h | 4 +- swad_chat.c | 7 +- swad_connected.c | 45 ++++---- swad_country.c | 49 ++++----- swad_course.c | 141 ++++++++++++------------- swad_date.c | 17 +-- swad_degree.c | 67 ++++++------ swad_degree_type.c | 23 ++-- swad_department.c | 31 +++--- swad_duplicate.c | 13 +-- swad_enrolment.c | 59 ++++++----- swad_exam.c | 7 +- swad_file_browser.c | 165 +++++++++++++++-------------- swad_follow.c | 61 +++++------ swad_forum.c | 45 ++++---- swad_game.c | 59 ++++++----- swad_global.c | 1 + swad_group.c | 71 ++++++------- swad_help.c | 5 +- swad_hierarchy.c | 55 +++++----- swad_holiday.c | 39 +++---- swad_icon.c | 7 +- swad_image.c | 5 +- swad_indicator.c | 10 +- swad_info.c | 43 ++++---- swad_institution.c | 75 ++++++------- swad_language.c | 5 +- swad_layout.c | 19 ++-- swad_link.c | 31 +++--- swad_logo.c | 5 +- swad_mail.c | 41 ++++---- swad_mark.c | 13 +-- swad_menu.c | 11 +- swad_message.c | 45 ++++---- swad_network.c | 5 +- swad_nickname.c | 19 ++-- swad_notice.c | 17 +-- swad_notification.c | 41 ++++---- swad_pagination.c | 157 ++++++++++++++-------------- swad_password.c | 13 +-- swad_photo.c | 55 +++++----- swad_place.c | 27 ++--- swad_plugin.c | 33 +++--- swad_preference.c | 5 +- swad_privacy.c | 5 +- swad_profile.c | 27 ++--- swad_project.c | 41 ++++---- swad_record.c | 107 +++++++++---------- swad_report.c | 5 +- swad_role.c | 5 +- swad_search.c | 9 +- swad_social.c | 102 +++++++++--------- swad_statistic.c | 41 ++++---- swad_string.c | 5 +- swad_survey.c | 49 ++++----- swad_syllabus.c | 17 +-- swad_tab.c | 25 ++--- swad_test.c | 77 +++++++------- swad_test_import.c | 5 +- swad_theme.c | 5 +- swad_timetable.c | 7 +- swad_user.c | 69 ++++++------ swad_web_service.c | 4 +- swad_zip.c | 7 +- 79 files changed, 1339 insertions(+), 1532 deletions(-) diff --git a/Makefile b/Makefile index 98233bab..4f84dc09 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,7 @@ OBJS = swad_account.o swad_action.o swad_agenda.o swad_alert.o \ swad_database.o swad_date.o swad_degree.o swad_degree_type.o \ swad_department.o swad_duplicate.o \ swad_enrolment.o swad_exam.o \ - swad_file.o swad_file_browser.o swad_follow.o swad_forum.o \ + swad_file.o swad_file_browser.o swad_follow.o swad_form.o swad_forum.o \ swad_game.o swad_global.o swad_group.o \ swad_help.o swad_hierarchy.o swad_holiday.o \ swad_icon.o swad_ID.o swad_image.o swad_indicator.o swad_info.o \ @@ -66,7 +66,7 @@ CC = gcc # LIBS when using MariaDB (also valid with MySQL): LIBS = -lssl -lcrypto -lpthread -lrt -lmysqlclient -lz -L/usr/lib64/mysql -lm -lgsoap -CFLAGS = -Wall -Wextra -mtune=native -O2 -s +CFLAGS = -Wall -Wextra -mtune=native -Os -s all: swad_ca swad_de swad_en swad_es swad_fr swad_gn swad_it swad_pl swad_pt diff --git a/swad_ID.c b/swad_ID.c index 2ba4e65e..20cf837f 100644 --- a/swad_ID.c +++ b/swad_ID.c @@ -35,6 +35,7 @@ #include "swad_account.h" #include "swad_box.h" #include "swad_database.h" +#include "swad_form.h" #include "swad_global.h" #include "swad_ID.h" #include "swad_parameter.h" @@ -474,7 +475,7 @@ static void ID_PutLinkToConfirmID (struct UsrData *UsrDat,unsigned NumID, NextAction = ActCnfID_Oth; break; } - Act_StartFormAnchor (NextAction,Anchor); + Frm_StartFormAnchor (NextAction,Anchor); if (Gbl.Action.Original != ActUnk) { Par_PutHiddenParamLong ("OriginalActCod", @@ -501,7 +502,7 @@ static void ID_PutLinkToConfirmID (struct UsrData *UsrDat,unsigned NumID, The_ClassFormBold[Gbl.Prefs.Theme],NULL); /***** End form *****/ - Act_EndForm (); + Frm_EndForm (); } /*****************************************************************************/ @@ -624,7 +625,7 @@ static void ID_ShowFormChangeUsrID (const struct UsrData *UsrDat, { /* Form to remove user's ID */ if (ItsMe) - Act_StartFormAnchor (ActRemID_Me,ID_ID_SECTION_ID); + Frm_StartFormAnchor (ActRemID_Me,ID_ID_SECTION_ID); else { switch (UsrDat->Roles.InCurrentCrs.Role) @@ -640,14 +641,14 @@ static void ID_ShowFormChangeUsrID (const struct UsrData *UsrDat, NextAction = ActRemID_Oth; break; } - Act_StartFormAnchor (NextAction,ID_ID_SECTION_ID); + Frm_StartFormAnchor (NextAction,ID_ID_SECTION_ID); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); } fprintf (Gbl.F.Out,"", UsrDat->IDs.List[NumID].ID); Ico_PutIconRemove (); - Act_EndForm (); + Frm_EndForm (); } } @@ -699,7 +700,7 @@ static void ID_ShowFormChangeUsrID (const struct UsrData *UsrDat, UsrDat->IDs.Num ? Txt_Another_ID : // A new user's ID Txt_ID); // The first user's ID if (ItsMe) - Act_StartFormAnchor (ActNewIDMe,ID_ID_SECTION_ID); + Frm_StartFormAnchor (ActNewIDMe,ID_ID_SECTION_ID); else { switch (UsrDat->Roles.InCurrentCrs.Role) @@ -715,7 +716,7 @@ static void ID_ShowFormChangeUsrID (const struct UsrData *UsrDat, NextAction = ActNewID_Oth; break; } - Act_StartFormAnchor (NextAction,ID_ID_SECTION_ID); + Frm_StartFormAnchor (NextAction,ID_ID_SECTION_ID); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); } fprintf (Gbl.F.Out,"IDs.Num ? UsrDat->IDs.List[UsrDat->IDs.Num - 1].ID : ""); // Show the most recent ID Btn_PutCreateButtonInline (Txt_Add_this_ID); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,"" ""); } diff --git a/swad_MFU.c b/swad_MFU.c index c782ea80..04e2c3d0 100644 --- a/swad_MFU.c +++ b/swad_MFU.c @@ -35,6 +35,7 @@ #include "swad_box.h" #include "swad_config.h" #include "swad_database.h" +#include "swad_form.h" #include "swad_global.h" #include "swad_MFU.h" #include "swad_tab.h" @@ -243,14 +244,14 @@ void MFU_WriteBigMFUActions (struct MFU_ListMFUActions *ListMFUActions) /* Icon and text */ fprintf (Gbl.F.Out,"
  • "); - Act_StartForm (Action); - Act_LinkFormSubmit (TabMenuStr,The_ClassFormNoWrap[Gbl.Prefs.Theme],NULL); + Frm_StartForm (Action); + Frm_LinkFormSubmit (TabMenuStr,The_ClassFormNoWrap[Gbl.Prefs.Theme],NULL); fprintf (Gbl.F.Out,"\"%s\"", Gbl.Prefs.PathIconSet,Cfg_ICON_ACTION, Act_GetIcon (Action), MenuStr); fprintf (Gbl.F.Out," %s",TabMenuStr); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,"
    • "); } } @@ -278,12 +279,12 @@ void MFU_WriteSmallMFUActions (struct MFU_ListMFUActions *ListMFUActions) /***** Start div and link *****/ fprintf (Gbl.F.Out,"
    "); - Act_StartForm (ActMFUAct); - Act_LinkFormSubmit (Txt_My_frequent_actions,NULL,NULL); + Frm_StartForm (ActMFUAct); + Frm_LinkFormSubmit (Txt_My_frequent_actions,NULL,NULL); fprintf (Gbl.F.Out," %s" "", Txt_Frequent_ACTIONS); - Act_EndForm (); + Frm_EndForm (); /***** Write list of frequently used actions *****/ fprintf (Gbl.F.Out,"
    "); @@ -234,7 +235,7 @@ static void Agd_ShowFormToSelPrivatPublicEvents (void) fprintf (Gbl.F.Out,"
    ", (Gbl.Agenda.PrivatPublicEvents & (1 << PrvPub)) ? "PREF_ON" : "PREF_OFF"); - Act_StartForm (ActSeeMyAgd); + Frm_StartForm (ActSeeMyAgd); Agd_PutParamsMyAgenda (Gbl.Agenda.Past__FutureEvents, Gbl.Agenda.PrivatPublicEvents ^ (1 << PrvPub), // Toggle Gbl.Agenda.HiddenVisiblEvents, @@ -248,7 +249,7 @@ static void Agd_ShowFormToSelPrivatPublicEvents (void) Image[PrvPub], Txt_AGENDA_PRIVAT_PUBLIC_EVENTS[PrvPub], Txt_AGENDA_PRIVAT_PUBLIC_EVENTS[PrvPub]); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,"
    "); } fprintf (Gbl.F.Out,""); @@ -276,7 +277,7 @@ static void Agd_ShowFormToSelHiddenVisiblEvents (void) fprintf (Gbl.F.Out,"
    ", (Gbl.Agenda.HiddenVisiblEvents & (1 << HidVis)) ? "PREF_ON" : "PREF_OFF"); - Act_StartForm (ActSeeMyAgd); + Frm_StartForm (ActSeeMyAgd); Agd_PutParamsMyAgenda (Gbl.Agenda.Past__FutureEvents, Gbl.Agenda.PrivatPublicEvents, Gbl.Agenda.HiddenVisiblEvents ^ (1 << HidVis), // Toggle @@ -290,7 +291,7 @@ static void Agd_ShowFormToSelHiddenVisiblEvents (void) Image[HidVis], Txt_AGENDA_HIDDEN_VISIBL_EVENTS[HidVis], Txt_AGENDA_HIDDEN_VISIBL_EVENTS[HidVis]); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,"
    "); } fprintf (Gbl.F.Out,""); @@ -592,25 +593,25 @@ static void Agd_WriteHeaderListEvents (Agd_AgendaType_t AgendaType) { case Agd_MY_AGENDA_TODAY: case Agd_MY_AGENDA: - Act_StartForm (ActSeeMyAgd); + Frm_StartForm (ActSeeMyAgd); Pag_PutHiddenParamPagNum (Pag_MY_AGENDA,Gbl.Agenda.CurrentPage); break; case Agd_ANOTHER_AGENDA_TODAY: case Agd_ANOTHER_AGENDA: - Act_StartForm (ActSeeUsrAgd); + Frm_StartForm (ActSeeUsrAgd); Usr_PutParamOtherUsrCodEncrypted (); Pag_PutHiddenParamPagNum (Pag_ANOTHER_AGENDA,Gbl.Agenda.CurrentPage); break; } Par_PutHiddenParamUnsigned ("Order",(unsigned) Order); - Act_LinkFormSubmit (Txt_START_END_TIME_HELP[Order],"TIT_TBL",NULL); + Frm_LinkFormSubmit (Txt_START_END_TIME_HELP[Order],"TIT_TBL",NULL); if (Order == Gbl.Agenda.SelectedOrder) fprintf (Gbl.F.Out,""); fprintf (Gbl.F.Out,"%s",Txt_START_END_TIME[Order]); if (Order == Gbl.Agenda.SelectedOrder) fprintf (Gbl.F.Out,""); fprintf (Gbl.F.Out,"    "); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,""); } fprintf (Gbl.F.Out,"" @@ -716,14 +717,14 @@ static void Agd_PutButtonToCreateNewEvent (void) { extern const char *Txt_New_event; - Act_StartForm (ActFrmNewEvtMyAgd); + Frm_StartForm (ActFrmNewEvtMyAgd); Agd_PutParamsMyAgenda (Gbl.Agenda.Past__FutureEvents, Gbl.Agenda.PrivatPublicEvents, Gbl.Agenda.HiddenVisiblEvents, Gbl.Agenda.CurrentPage, -1L); Btn_PutConfirmButton (Txt_New_event); - Act_EndForm (); + Frm_EndForm (); } /*****************************************************************************/ @@ -1537,12 +1538,12 @@ void Agd_RequestCreatOrEditEvent (void) /***** Start form *****/ if (ItsANewEvent) { - Act_StartForm (ActNewEvtMyAgd); + Frm_StartForm (ActNewEvtMyAgd); Gbl.Agenda.AgdCodToEdit = -1L; } else { - Act_StartForm (ActChgEvtMyAgd); + Frm_StartForm (ActChgEvtMyAgd); Gbl.Agenda.AgdCodToEdit = AgdEvent.AgdCod; } Agd_PutCurrentParamsMyAgenda (); @@ -1612,7 +1613,7 @@ void Agd_RequestCreatOrEditEvent (void) Box_EndBoxTableWithButton (Btn_CONFIRM_BUTTON,Txt_Save); /***** End form *****/ - Act_EndForm (); + Frm_EndForm (); /***** Show current events, if any *****/ Agd_ShowMyAgenda (); diff --git a/swad_alert.c b/swad_alert.c index 53e3582c..bc0ae8c5 100644 --- a/swad_alert.c +++ b/swad_alert.c @@ -28,6 +28,7 @@ #include // For NULL #include "swad_alert.h" +#include "swad_form.h" #include "swad_global.h" /*****************************************************************************/ @@ -115,7 +116,7 @@ void Ale_ShowAlertAndButton (Ale_AlertType_t AlertType,const char *Txt, void Ale_ShowAlertAndButton1 (Ale_AlertType_t AlertType,const char *Txt) { extern const char *Txt_Close; - char IdAlert[Act_MAX_BYTES_ID + 1]; + char IdAlert[Frm_MAX_BYTES_ID + 1]; static const bool AlertClosable[Ale_NUM_ALERT_TYPES] = { false, // Ale_NONE @@ -136,7 +137,7 @@ void Ale_ShowAlertAndButton1 (Ale_AlertType_t AlertType,const char *Txt) if (AlertClosable[AlertType]) { /* Create unique id for alert */ - Act_SetUniqueId (IdAlert); + Frm_SetUniqueId (IdAlert); fprintf (Gbl.F.Out," id=\"%s\"",IdAlert); } fprintf (Gbl.F.Out," class=\"CENTER_MIDDLE\">" @@ -178,8 +179,8 @@ void Ale_ShowAlertAndButton2 (Act_Action_t NextAction,const char *Anchor,const c if (TxtButton[0]) { /* Start form */ - Act_StartFormAnchor (NextAction,Anchor); - Act_StartFormAnchorOnSubmit (NextAction,Anchor,OnSubmit); + Frm_StartFormAnchor (NextAction,Anchor); + Frm_StartFormAnchorOnSubmit (NextAction,Anchor,OnSubmit); if (FuncParams) FuncParams (); @@ -187,7 +188,7 @@ void Ale_ShowAlertAndButton2 (Act_Action_t NextAction,const char *Anchor,const c Btn_PutButton (Button,TxtButton); /* End form */ - Act_EndForm (); + Frm_EndForm (); } /***** End box *****/ diff --git a/swad_announcement.c b/swad_announcement.c index 05e19a41..a45d1fee 100644 --- a/swad_announcement.c +++ b/swad_announcement.c @@ -28,6 +28,7 @@ #include "swad_announcement.h" #include "swad_box.h" #include "swad_database.h" +#include "swad_form.h" #include "swad_global.h" #include "swad_parameter.h" #include "swad_role.h" @@ -200,9 +201,9 @@ static void Ann_PutButtonToAddNewAnnouncement (void) { extern const char *Txt_New_announcement; - Act_StartForm (ActWriAnn); + Frm_StartForm (ActWriAnn); Btn_PutConfirmButton (Txt_New_announcement); - Act_EndForm (); + Frm_EndForm (); } /*****************************************************************************/ @@ -411,7 +412,7 @@ void Ann_ShowFormAnnouncement (void) extern const char *Txt_Create_announcement; /***** Start form *****/ - Act_StartForm (ActRcvAnn); + Frm_StartForm (ActRcvAnn); /***** Start box and table *****/ Box_StartBoxTable (NULL,Txt_New_announcement,NULL, @@ -447,7 +448,7 @@ void Ann_ShowFormAnnouncement (void) Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_announcement); /***** End form *****/ - Act_EndForm (); + Frm_EndForm (); } /*****************************************************************************/ diff --git a/swad_assignment.c b/swad_assignment.c index 6356554c..4ca409ac 100644 --- a/swad_assignment.c +++ b/swad_assignment.c @@ -35,6 +35,7 @@ #include "swad_assignment.h" #include "swad_box.h" #include "swad_database.h" +#include "swad_form.h" #include "swad_global.h" #include "swad_group.h" #include "swad_notification.h" @@ -207,11 +208,11 @@ static void Asg_PutHeadForSeeing (bool PrintView) if (!PrintView) { - Act_StartForm (ActSeeAsg); + Frm_StartForm (ActSeeAsg); Grp_PutParamWhichGrps (); Pag_PutHiddenParamPagNum (Pag_ASSIGNMENTS,Gbl.Asgs.CurrentPage); Par_PutHiddenParamUnsigned ("Order",(unsigned) Order); - Act_LinkFormSubmit (Txt_START_END_TIME_HELP[Order],"TIT_TBL",NULL); + Frm_LinkFormSubmit (Txt_START_END_TIME_HELP[Order],"TIT_TBL",NULL); if (Order == Gbl.Asgs.SelectedOrder) fprintf (Gbl.F.Out,""); } @@ -221,7 +222,7 @@ static void Asg_PutHeadForSeeing (bool PrintView) if (Order == Gbl.Asgs.SelectedOrder) fprintf (Gbl.F.Out,""); fprintf (Gbl.F.Out,""); - Act_EndForm (); + Frm_EndForm (); } fprintf (Gbl.F.Out,""); @@ -291,10 +292,10 @@ static void Asg_PutButtonToCreateNewAsg (void) extern const char *Txt_New_assignment; Gbl.Asgs.AsgCodToEdit = -1L; - Act_StartForm (ActFrmNewAsg); + Frm_StartForm (ActFrmNewAsg); Asg_PutParams (); Btn_PutConfirmButton (Txt_New_assignment); - Act_EndForm (); + Frm_EndForm (); } /*****************************************************************************/ @@ -519,7 +520,7 @@ static void Asg_WriteAssignmentFolder (struct Assignment *Asg,bool PrintView) ICanSendFiles) // I can send files to this assignment folder { /* Form to create a new file or folder */ - Act_StartForm (ActFrmCreAsgUsr); + Frm_StartForm (ActFrmCreAsgUsr); Brw_PutParamsFileBrowser (ActUnk, Brw_INTERNAL_NAME_ROOT_FOLDER_ASSIGNMENTS, Asg->Folder, @@ -533,7 +534,7 @@ static void Asg_WriteAssignmentFolder (struct Assignment *Asg,bool PrintView) Gbl.Prefs.IconsURL, Gbl.Title, Gbl.Title); - Act_EndForm (); + Frm_EndForm (); } else // I can't send files to this assignment folder fprintf (Gbl.F.Out,""); - Act_StartForm (ActSeeAtt); + Frm_StartForm (ActSeeAtt); Grp_PutParamWhichGrps (); Pag_PutHiddenParamPagNum (Pag_ATT_EVENTS,Gbl.AttEvents.CurrentPage); Par_PutHiddenParamUnsigned ("Order",(unsigned) Order); - Act_LinkFormSubmit (Txt_START_END_TIME_HELP[Order],"TIT_TBL",NULL); + Frm_LinkFormSubmit (Txt_START_END_TIME_HELP[Order],"TIT_TBL",NULL); if (Order == Gbl.AttEvents.SelectedOrder) fprintf (Gbl.F.Out,""); fprintf (Gbl.F.Out,"%s",Txt_START_END_TIME[Order]); if (Order == Gbl.AttEvents.SelectedOrder) fprintf (Gbl.F.Out,""); fprintf (Gbl.F.Out,""); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,""); } fprintf (Gbl.F.Out,"" @@ -347,10 +348,10 @@ static void Att_PutButtonToCreateNewAttEvent (void) { extern const char *Txt_New_event; - Act_StartForm (ActFrmNewAtt); + Frm_StartForm (ActFrmNewAtt); Att_PutParamsToCreateNewAttEvent (); Btn_PutConfirmButton (Txt_New_event); - Act_EndForm (); + Frm_EndForm (); } /*****************************************************************************/ @@ -442,13 +443,13 @@ static void Att_ShowOneAttEvent (struct AttendanceEvent *Att,bool ShowOnlyThisAt fprintf (Gbl.F.Out,"\">"); /* Put form to view attendance event */ - Act_StartForm (ActSeeOneAtt); + Frm_StartForm (ActSeeOneAtt); Att_PutParamAttCod (Att->AttCod); Att_PutParamsCodGrps (Att->AttCod); - Act_LinkFormSubmit (Txt_View_event,Att->Hidden ? "ASG_TITLE_LIGHT" : + Frm_LinkFormSubmit (Txt_View_event,Att->Hidden ? "ASG_TITLE_LIGHT" : "ASG_TITLE",NULL); fprintf (Gbl.F.Out,"%s",Att->Title); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,""); /* Number of students in this event */ @@ -898,7 +899,7 @@ void Att_AskRemAttEvent (void) Att_GetDataOfAttEventByCodAndCheckCrs (&Att); /***** Button of confirmation of removing *****/ - Act_StartForm (ActRemAtt); + Frm_StartForm (ActRemAtt); Att_PutParamAttCod (Att.AttCod); Att_PutHiddenParamAttOrder (); Grp_PutParamWhichGrps (); @@ -910,7 +911,7 @@ void Att_AskRemAttEvent (void) Att.Title); Ale_ShowAlert (Ale_WARNING,Gbl.Alert.Txt); Btn_PutRemoveButton (Txt_Remove_event); - Act_EndForm (); + Frm_EndForm (); /***** Show attendance events again *****/ Att_SeeAttEvents (); @@ -1098,10 +1099,10 @@ void Att_RequestCreatOrEditAttEvent (void) /***** Start form *****/ if (ItsANewAttEvent) - Act_StartForm (ActNewAtt); + Frm_StartForm (ActNewAtt); else { - Act_StartForm (ActChgAtt); + Frm_StartForm (ActChgAtt); Att_PutParamAttCod (Att.AttCod); } Att_PutHiddenParamAttOrder (); @@ -1186,7 +1187,7 @@ void Att_RequestCreatOrEditAttEvent (void) Box_EndBoxTableWithButton (Btn_CONFIRM_BUTTON,Txt_Save); /***** End form *****/ - Act_EndForm (); + Frm_EndForm (); /***** Show current attendance events *****/ Att_GetListAttEvents (Att_NEWEST_FIRST); @@ -1883,7 +1884,7 @@ static void Att_ListAttOnlyMeAsStudent (struct AttendanceEvent *Att) /***** Start form *****/ if (Att->Open) { - Act_StartForm (ActRecAttMe); + Frm_StartForm (ActRecAttMe); Att_PutParamAttCod (Att->AttCod); } @@ -1921,7 +1922,7 @@ static void Att_ListAttOnlyMeAsStudent (struct AttendanceEvent *Att) { /***** Send button *****/ Btn_PutConfirmButton (Txt_Save); - Act_EndForm (); + Frm_EndForm (); } } @@ -1966,7 +1967,7 @@ static void Att_ListAttStudents (struct AttendanceEvent *Att) Usr_UsrDataConstructor (&UsrDat); /***** Start form *****/ - Act_StartForm (ActRecAttStd); + Frm_StartForm (ActRecAttStd); Att_PutParamAttCod (Att->AttCod); Grp_PutParamsCodGrps (); @@ -2013,7 +2014,7 @@ static void Att_ListAttStudents (struct AttendanceEvent *Att) Btn_PutConfirmButton (Txt_Save); /***** End form *****/ - Act_EndForm (); + Frm_EndForm (); /***** Free memory used for user's data *****/ Usr_UsrDataDestructor (&UsrDat); @@ -2718,7 +2719,7 @@ void Usr_ReqListStdsAttendanceCrs (void) Usr_ShowFormsToSelectUsrListType (ActReqLstStdAtt); /* Start form */ - Act_StartForm (ActSeeLstStdAtt); + Frm_StartForm (ActSeeLstStdAtt); Grp_PutParamsCodGrps (); /* Write list of students to select some of them */ @@ -2730,7 +2731,7 @@ void Usr_ReqListStdsAttendanceCrs (void) Btn_PutConfirmButton (Txt_Show_list); /* End form */ - Act_EndForm (); + Frm_EndForm (); /***** Free memory used by list of selected users' codes *****/ Usr_FreeListsSelectedUsrsCods (); @@ -3127,7 +3128,7 @@ static void Att_PutButtonToShowDetails (void) extern const char *Txt_Show_more_details; /***** Button to show more details *****/ - Act_StartFormAnchor (Gbl.Action.Act,Att_ATTENDANCE_DETAILS_ID); + Frm_StartFormAnchor (Gbl.Action.Act,Att_ATTENDANCE_DETAILS_ID); Par_PutHiddenParamChar ("ShowDetails",'Y'); Grp_PutParamsCodGrps (); Usr_PutHiddenParUsrCodAll (Gbl.Action.Act,Gbl.Usrs.Select[Rol_UNK]); @@ -3135,7 +3136,7 @@ static void Att_PutButtonToShowDetails (void) if (Gbl.AttEvents.StrAttCodsSelected[0]) Par_PutHiddenParamString ("AttCods",Gbl.AttEvents.StrAttCodsSelected); Btn_PutConfirmButton (Txt_Show_more_details); - Act_EndForm (); + Frm_EndForm (); } /*****************************************************************************/ @@ -3168,7 +3169,7 @@ static void Att_ListEventsToSelect (Att_TypeOfView_t TypeOfView) depending on the events selected *****/ if (NormalView) { - Act_StartFormAnchor (Gbl.Action.Act,Att_ATTENDANCE_TABLE_ID); + Frm_StartFormAnchor (Gbl.Action.Act,Att_ATTENDANCE_TABLE_ID); Grp_PutParamsCodGrps (); Usr_PutHiddenParUsrCodAll (Gbl.Action.Act,Gbl.Usrs.Select[Rol_UNK]); } @@ -3240,7 +3241,7 @@ static void Att_ListEventsToSelect (Att_TypeOfView_t TypeOfView) { fprintf (Gbl.F.Out,"" ""); - Act_LinkFormSubmitAnimated (Txt_Update_attendance_according_to_selected_events, + Frm_LinkFormSubmitAnimated (Txt_Update_attendance_according_to_selected_events, The_ClassFormBold[Gbl.Prefs.Theme], NULL); Ico_PutCalculateIconWithText (Txt_Update_attendance_according_to_selected_events, @@ -3254,7 +3255,7 @@ static void Att_ListEventsToSelect (Att_TypeOfView_t TypeOfView) /***** End form *****/ if (NormalView) - Act_EndForm (); + Frm_EndForm (); /***** End box *****/ Box_EndBox (); diff --git a/swad_banner.c b/swad_banner.c index fe42e94e..12701cf9 100644 --- a/swad_banner.c +++ b/swad_banner.c @@ -35,6 +35,7 @@ #include "swad_box.h" #include "swad_constant.h" #include "swad_database.h" +#include "swad_form.h" #include "swad_global.h" #include "swad_parameter.h" #include "swad_photo.h" @@ -136,9 +137,9 @@ void Ban_SeeBanners (void) /***** Button to create banner *****/ if (Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM) { - Act_StartForm (ActEdiBan); + Frm_StartForm (ActEdiBan); Btn_PutConfirmButton (Txt_New_banner); - Act_EndForm (); + Frm_EndForm (); } /***** End box *****/ @@ -399,15 +400,15 @@ static void Ban_ListBannersForEdition (void) /* Put icon to remove banner */ fprintf (Gbl.F.Out,"" ""); - Act_StartForm (ActRemBan); + Frm_StartForm (ActRemBan); Ban_PutParamBanCod (Ban->BanCod); Ico_PutIconRemove (); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,""); /* Put icon to hide/show banner */ fprintf (Gbl.F.Out,""); - Act_StartForm (Ban->Hidden ? ActShoBan : + Frm_StartForm (Ban->Hidden ? ActShoBan : ActHidBan); Ban_PutParamBanCod (Ban->BanCod); fprintf (Gbl.F.Out,"Hidden ? Txt_Show : Txt_Hide); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,""); /* Banner code */ @@ -432,49 +433,49 @@ static void Ban_ListBannersForEdition (void) /* Banner short name */ fprintf (Gbl.F.Out,""); - Act_StartForm (ActRenBanSho); + Frm_StartForm (ActRenBanSho); Ban_PutParamBanCod (Ban->BanCod); fprintf (Gbl.F.Out,"", Ban_MAX_CHARS_SHRT_NAME,Ban->ShrtName,Gbl.Form.Id); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,""); /* Banner full name */ fprintf (Gbl.F.Out,""); - Act_StartForm (ActRenBanFul); + Frm_StartForm (ActRenBanFul); Ban_PutParamBanCod (Ban->BanCod); fprintf (Gbl.F.Out,"", Ban_MAX_CHARS_FULL_NAME,Ban->FullName,Gbl.Form.Id); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,""); /* Banner image */ fprintf (Gbl.F.Out,""); - Act_StartForm (ActChgBanImg); + Frm_StartForm (ActChgBanImg); Ban_PutParamBanCod (Ban->BanCod); fprintf (Gbl.F.Out,"", Ban_MAX_CHARS_IMAGE,Ban->Img,Gbl.Form.Id); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,""); /* Banner WWW */ fprintf (Gbl.F.Out,""); - Act_StartForm (ActChgBanWWW); + Frm_StartForm (ActChgBanWWW); Ban_PutParamBanCod (Ban->BanCod); fprintf (Gbl.F.Out,"", Cns_MAX_CHARS_WWW,Ban->WWW,Gbl.Form.Id); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,"" ""); } @@ -833,7 +834,7 @@ static void Ban_PutFormToCreateBanner (void) Ban = &Gbl.Banners.EditingBan; /***** Start form *****/ - Act_StartForm (ActNewBan); + Frm_StartForm (ActNewBan); /***** Start box and table *****/ Box_StartBoxTable (NULL,Txt_New_banner,NULL, @@ -888,7 +889,7 @@ static void Ban_PutFormToCreateBanner (void) Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_banner); /***** End form *****/ - Act_EndForm (); + Frm_EndForm (); } /*****************************************************************************/ @@ -1028,10 +1029,10 @@ void Ban_WriteMenuWithBanners (void) { /* Write data of this banner */ fprintf (Gbl.F.Out,"
    "); - Act_StartForm (ActClkBan); + Frm_StartForm (ActClkBan); Ban_PutParamBanCod (Gbl.Banners.Lst[NumBan].BanCod); Par_PutHiddenParamString ("URL",Gbl.Banners.Lst[NumBan].WWW); - Act_LinkFormSubmit (Gbl.Banners.Lst[NumBan].FullName,"BANNER",NULL); + Frm_LinkFormSubmit (Gbl.Banners.Lst[NumBan].FullName,"BANNER",NULL); fprintf (Gbl.F.Out,"\"%s\"" @@ -1040,7 +1041,7 @@ void Ban_WriteMenuWithBanners (void) Gbl.Banners.Lst[NumBan].Img, Gbl.Banners.Lst[NumBan].ShrtName, Gbl.Banners.Lst[NumBan].FullName); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,"
    "); } diff --git a/swad_box.c b/swad_box.c index 32807423..c95926e9 100644 --- a/swad_box.c +++ b/swad_box.c @@ -30,6 +30,7 @@ #include "swad_action.h" #include "swad_box.h" +#include "swad_form.h" #include "swad_global.h" #include "swad_help.h" #include "swad_table.h" @@ -114,14 +115,14 @@ static void Box_StartBoxInternal (const char *Width,const char *Title, { extern const char *Txt_Help; extern const char *Txt_Close; - char IdFrame[Act_MAX_BYTES_ID + 1]; + char IdFrame[Frm_MAX_BYTES_ID + 1]; /***** Start box container *****/ fprintf (Gbl.F.Out,"
    "); diff --git a/swad_calendar.c b/swad_calendar.c index b9c5c7bb..a2c1c6ea 100644 --- a/swad_calendar.c +++ b/swad_calendar.c @@ -33,6 +33,7 @@ #include "swad_calendar.h" #include "swad_database.h" #include "swad_exam.h" +#include "swad_form.h" #include "swad_global.h" #include "swad_parameter.h" #include "swad_preference.h" @@ -123,7 +124,7 @@ void Cal_ShowFormToSelFirstDayOfWeek (Act_Action_t Action,void (*FuncParams) (), fprintf (Gbl.F.Out,"
    ", FirstDayOfWeek == Gbl.Prefs.FirstDayOfWeek ? "PREF_ON" : "PREF_OFF"); - Act_StartForm (Action); + Frm_StartForm (Action); Par_PutHiddenParamUnsigned ("FirstDayOfWeek",FirstDayOfWeek); if (FuncParams) // Extra parameters depending on the action FuncParams (); @@ -134,7 +135,7 @@ void Cal_ShowFormToSelFirstDayOfWeek (Act_Action_t Action,void (*FuncParams) (), Txt_DAYS_SMALL[FirstDayOfWeek], Txt_First_day_of_the_week,Txt_DAYS_SMALL[FirstDayOfWeek], ClassIcon); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,"
    "); } fprintf (Gbl.F.Out,"
    "); @@ -202,7 +203,7 @@ unsigned Cal_GetFirstDayOfWeekFromStr (const char *Str) void Cal_DrawCurrentMonth (void) { extern const char *Txt_STR_LANG_ID[1 + Txt_NUM_LANGUAGES]; - char ParamsStr[Act_MAX_BYTES_PARAMS_STR]; + char ParamsStr[Frm_MAX_BYTES_PARAMS_STR]; /***** Get list of holidays *****/ if (!Gbl.Hlds.LstIsRead) @@ -225,9 +226,9 @@ void Cal_DrawCurrentMonth (void) Gbl.CurrentCtr.Ctr.PlcCod, Cfg_URL_SWAD_CGI, Txt_STR_LANG_ID[Gbl.Prefs.Language]); - Act_SetParamsForm (ParamsStr,Cal_GetActionToSeeCalendar (),true); + Frm_SetParamsForm (ParamsStr,Cal_GetActionToSeeCalendar (),true); fprintf (Gbl.F.Out,"'%s',",ParamsStr); - Act_SetParamsForm (ParamsStr,ActSeeDatExaAnn,true); + Frm_SetParamsForm (ParamsStr,ActSeeDatExaAnn,true); fprintf (Gbl.F.Out,"'%s');" "",ParamsStr); } @@ -302,7 +303,7 @@ static void Cal_DrawCalendar (Act_Action_t ActionSeeCalendar, { extern const char *Hlp_Calendar; extern const char *Txt_STR_LANG_ID[1 + Txt_NUM_LANGUAGES]; - char ParamsStr[Act_MAX_BYTES_PARAMS_STR]; + char ParamsStr[Frm_MAX_BYTES_PARAMS_STR]; /***** Get list of holidays *****/ if (!Gbl.Hlds.LstIsRead) @@ -340,10 +341,10 @@ static void Cal_DrawCalendar (Act_Action_t ActionSeeCalendar, "false", Cfg_URL_SWAD_CGI, Txt_STR_LANG_ID[Gbl.Prefs.Language]); - Act_SetParamsForm (ParamsStr,ActionSeeCalendar,true); + Frm_SetParamsForm (ParamsStr,ActionSeeCalendar,true); fprintf (Gbl.F.Out,"'%s',", ParamsStr); - Act_SetParamsForm (ParamsStr,ActSeeDatExaAnn,true); + Frm_SetParamsForm (ParamsStr,ActSeeDatExaAnn,true); fprintf (Gbl.F.Out,"'%s');" "", ParamsStr); diff --git a/swad_centre.c b/swad_centre.c index 727b73cb..8170f537 100644 --- a/swad_centre.c +++ b/swad_centre.c @@ -38,6 +38,7 @@ #include "swad_centre.h" #include "swad_constant.h" #include "swad_database.h" +#include "swad_form.h" #include "swad_global.h" #include "swad_help.h" #include "swad_hierarchy.h" @@ -241,14 +242,14 @@ void Ctr_DrawCentreLogoAndNameWithLink (struct Centre *Ctr,Act_Action_t Action, extern const char *Txt_Go_to_X; /***** Start form *****/ - Act_StartFormGoTo (Action); + Frm_StartFormGoTo (Action); Ctr_PutParamCtrCod (Ctr->CtrCod); /***** Link to action *****/ snprintf (Gbl.Title,sizeof (Gbl.Title), Txt_Go_to_X, Ctr->FullName); - Act_LinkFormSubmit (Gbl.Title,ClassLink,NULL); + Frm_LinkFormSubmit (Gbl.Title,ClassLink,NULL); /***** Draw centre logo *****/ Log_DrawLogo (Sco_SCOPE_CTR,Ctr->CtrCod,Ctr->ShrtName,20,ClassLogo,true); @@ -257,7 +258,7 @@ void Ctr_DrawCentreLogoAndNameWithLink (struct Centre *Ctr,Act_Action_t Action, fprintf (Gbl.F.Out," %s",Ctr->FullName); /***** End form *****/ - Act_EndForm (); + Frm_EndForm (); } /*****************************************************************************/ @@ -376,7 +377,7 @@ static void Ctr_Configuration (bool PrintView) // have permission to edit photo attribution { fprintf (Gbl.F.Out,"
    "); - Act_StartForm (ActChgCtrPhoAtt); + Frm_StartForm (ActChgCtrPhoAtt); fprintf (Gbl.F.Out,""); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,"
    "); } else if (PhotoAttribution) @@ -417,7 +418,7 @@ static void Ctr_Configuration (bool PrintView) Ins_GetListInstitutions (Gbl.CurrentCty.Cty.CtyCod,Ins_GET_BASIC_DATA); /* Put form to select institution */ - Act_StartForm (ActChgCtrInsCfg); + Frm_StartForm (ActChgCtrInsCfg); fprintf (Gbl.F.Out,""); - Act_EndForm (); + Frm_EndForm (); /* Free list of institutions */ Ins_FreeListInstitutions (); @@ -455,7 +456,7 @@ static void Ctr_Configuration (bool PrintView) // Only institution admins and system admins can edit centre full name { /* Form to change centre full name */ - Act_StartForm (ActRenCtrFulCfg); + Frm_StartForm (ActRenCtrFulCfg); fprintf (Gbl.F.Out,"", Gbl.Form.Id); @@ -537,7 +538,7 @@ static void Ctr_Configuration (bool PrintView) "", Gbl.Plcs.Lst[NumPlc].ShrtName); fprintf (Gbl.F.Out,""); - Act_EndForm (); + Frm_EndForm (); /* Free list of places */ Plc_FreeListPlaces (); @@ -561,7 +562,7 @@ static void Ctr_Configuration (bool PrintView) // can change centre WWW { /* Form to change centre WWW */ - Act_StartForm (ActChgCtrWWWCfg); + Frm_StartForm (ActChgCtrWWWCfg); fprintf (Gbl.F.Out,"" @@ -641,15 +642,15 @@ static void Ctr_Configuration (bool PrintView) Txt_Degrees); /* Form to go to see degrees of this centre */ - Act_StartFormGoTo (ActSeeDeg); + Frm_StartFormGoTo (ActSeeDeg); Ctr_PutParamCtrCod (Gbl.CurrentCtr.Ctr.CtrCod); snprintf (Gbl.Title,sizeof (Gbl.Title), Txt_Degrees_of_CENTRE_X, Gbl.CurrentCtr.Ctr.ShrtName); - Act_LinkFormSubmit (Gbl.Title,"DAT",NULL); + Frm_LinkFormSubmit (Gbl.Title,"DAT",NULL); fprintf (Gbl.F.Out,"%u", Deg_GetNumDegsInCtr (Gbl.CurrentCtr.Ctr.CtrCod)); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,"" ""); @@ -819,10 +820,10 @@ static void Ctr_ListCentres (void) /***** Button to create centre *****/ if (Ctr_CheckIfICanCreateCentres ()) { - Act_StartForm (ActEdiCtr); + Frm_StartForm (ActEdiCtr); Btn_PutConfirmButton (Gbl.Ctrs.Num ? Txt_Create_another_centre : Txt_Create_centre); - Act_EndForm (); + Frm_EndForm (); } /***** End box *****/ @@ -1387,7 +1388,7 @@ void Ctr_WriteSelectorOfCentre (void) long CtrCod; /***** Start form *****/ - Act_StartFormGoTo (ActSeeDeg); + Frm_StartFormGoTo (ActSeeDeg); fprintf (Gbl.F.Out,""); - Act_EndForm (); + Frm_EndForm (); } /*****************************************************************************/ @@ -1481,10 +1482,10 @@ static void Ctr_ListCentresForEdition (void) Ico_PutIconRemovalNotAllowed (); else { - Act_StartForm (ActRemCtr); + Frm_StartForm (ActRemCtr); Ctr_PutParamOtherCtrCod (Ctr->CtrCod); Ico_PutIconRemove (); - Act_EndForm (); + Frm_EndForm (); } fprintf (Gbl.F.Out,""); @@ -1505,7 +1506,7 @@ static void Ctr_ListCentresForEdition (void) fprintf (Gbl.F.Out,""); if (ICanEdit) { - Act_StartForm (ActChgCtrPlc); + Frm_StartForm (ActChgCtrPlc); Ctr_PutParamOtherCtrCod (Ctr->CtrCod); fprintf (Gbl.F.Out,""); - Act_EndForm (); + Frm_EndForm (); } else for (NumPlc = 0; @@ -1537,14 +1538,14 @@ static void Ctr_ListCentresForEdition (void) fprintf (Gbl.F.Out,""); if (ICanEdit) { - Act_StartForm (ActRenCtrSho); + Frm_StartForm (ActRenCtrSho); Ctr_PutParamOtherCtrCod (Ctr->CtrCod); fprintf (Gbl.F.Out,"", Hie_MAX_CHARS_SHRT_NAME,Ctr->ShrtName,Gbl.Form.Id); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,""); } else @@ -1555,14 +1556,14 @@ static void Ctr_ListCentresForEdition (void) fprintf (Gbl.F.Out,""); if (ICanEdit) { - Act_StartForm (ActRenCtrFul); + Frm_StartForm (ActRenCtrFul); Ctr_PutParamOtherCtrCod (Ctr->CtrCod); fprintf (Gbl.F.Out,"", Hie_MAX_CHARS_FULL_NAME,Ctr->FullName,Gbl.Form.Id); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,""); } else @@ -1573,14 +1574,14 @@ static void Ctr_ListCentresForEdition (void) fprintf (Gbl.F.Out,""); if (ICanEdit) { - Act_StartForm (ActChgCtrWWW); + Frm_StartForm (ActChgCtrWWW); Ctr_PutParamOtherCtrCod (Ctr->CtrCod); fprintf (Gbl.F.Out,"", Cns_MAX_CHARS_WWW,Ctr->WWW,Gbl.Form.Id); - Act_EndForm (); + Frm_EndForm (); } else { @@ -1627,7 +1628,7 @@ static void Ctr_ListCentresForEdition (void) if (Gbl.Usrs.Me.Role.Logged >= Rol_INS_ADM && StatusTxt == Ctr_STATUS_PENDING) { - Act_StartForm (ActChgCtrSta); + Frm_StartForm (ActChgCtrSta); Ctr_PutParamOtherCtrCod (Ctr->CtrCod); fprintf (Gbl.F.Out,""); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,""); } else if (MapAttribution) @@ -386,15 +387,15 @@ static void Cty_Configuration (bool PrintView) Txt_Institutions); /* Form to go to see institutions of this country */ - Act_StartFormGoTo (ActSeeIns); + Frm_StartFormGoTo (ActSeeIns); Cty_PutParamCtyCod (Gbl.CurrentCty.Cty.CtyCod); snprintf (Gbl.Title,sizeof (Gbl.Title), Txt_Institutions_of_COUNTRY_X, Gbl.CurrentCty.Cty.Name[Gbl.Prefs.Language]); - Act_LinkFormSubmit (Gbl.Title,"DAT",NULL); + Frm_LinkFormSubmit (Gbl.Title,"DAT",NULL); fprintf (Gbl.F.Out,"%u", Ins_GetNumInssInCty (Gbl.CurrentCty.Cty.CtyCod)); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,"" ""); @@ -645,9 +646,9 @@ static void Cty_PutHeadCountriesForSeeing (bool OrderSelectable) "RIGHT_MIDDLE"); if (OrderSelectable) { - Act_StartForm (ActSeeCty); + Frm_StartForm (ActSeeCty); Par_PutHiddenParamUnsigned ("Order",(unsigned) Order); - Act_LinkFormSubmit (Txt_COUNTRIES_HELP_ORDER[Order],"TIT_TBL",NULL); + Frm_LinkFormSubmit (Txt_COUNTRIES_HELP_ORDER[Order],"TIT_TBL",NULL); if (Order == Gbl.Ctys.SelectedOrder) fprintf (Gbl.F.Out,""); } @@ -657,7 +658,7 @@ static void Cty_PutHeadCountriesForSeeing (bool OrderSelectable) if (Order == Gbl.Ctys.SelectedOrder) fprintf (Gbl.F.Out,""); fprintf (Gbl.F.Out,""); - Act_EndForm (); + Frm_EndForm (); } fprintf (Gbl.F.Out,""); } @@ -802,7 +803,7 @@ void Cty_DrawCountryMapAndNameWithLink (struct Country *Cty,Act_Action_t Action, char CountryName[Cty_MAX_BYTES_NAME + 1]; /***** Start form *****/ - Act_StartFormGoTo (Action); + Frm_StartFormGoTo (Action); Cty_PutParamCtyCod (Cty->CtyCod); fprintf (Gbl.F.Out,"
    ",ClassContainer); @@ -810,7 +811,7 @@ void Cty_DrawCountryMapAndNameWithLink (struct Country *Cty,Act_Action_t Action, snprintf (Gbl.Title,sizeof (Gbl.Title), Txt_Go_to_X, Cty->Name[Gbl.Prefs.Language]); - Act_LinkFormSubmit (Gbl.Title,ClassLink,NULL); + Frm_LinkFormSubmit (Gbl.Title,ClassLink,NULL); /***** Draw country map *****/ Cty_DrawCountryMap (Cty,ClassMap); @@ -825,7 +826,7 @@ void Cty_DrawCountryMapAndNameWithLink (struct Country *Cty,Act_Action_t Action, Cty->Alpha2); /***** End form *****/ - Act_EndForm (); + Frm_EndForm (); } /*****************************************************************************/ @@ -1181,7 +1182,7 @@ void Cty_WriteSelectorOfCountry (void) long CtyCod; /***** Start form *****/ - Act_StartFormGoTo (ActSeeIns); + Frm_StartFormGoTo (ActSeeIns); fprintf (Gbl.F.Out,"", Cty_MAX_CHARS_NAME, Cty->Name[Lan],Gbl.Form.Id); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,""); /* WWW */ fprintf (Gbl.F.Out,""); - Act_StartForm (ActChgCtyWWW); + Frm_StartForm (ActChgCtyWWW); Cty_PutParamOtherCtyCod (Cty->CtyCod); Par_PutHiddenParamUnsigned ("Lan",(unsigned) Lan); fprintf (Gbl.F.Out,"", Cns_MAX_CHARS_WWW, Cty->WWW[Lan],Gbl.Form.Id); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,"" ""); } @@ -1965,7 +1966,7 @@ static void Cty_PutFormToCreateCountry (void) Cty = &Gbl.Ctys.EditingCty; /***** Start form *****/ - Act_StartForm (ActNewCty); + Frm_StartForm (ActNewCty); /***** Start box and table *****/ Box_StartBoxTable (NULL,Txt_New_country,NULL, @@ -2052,7 +2053,7 @@ static void Cty_PutFormToCreateCountry (void) Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_country); /***** End form *****/ - Act_EndForm (); + Frm_EndForm (); } /*****************************************************************************/ diff --git a/swad_course.c b/swad_course.c index 5bffa4e3..b80ab441 100644 --- a/swad_course.c +++ b/swad_course.c @@ -40,6 +40,7 @@ #include "swad_degree.h" #include "swad_enrolment.h" #include "swad_exam.h" +#include "swad_form.h" #include "swad_global.h" #include "swad_help.h" #include "swad_hierarchy.h" @@ -241,7 +242,7 @@ static void Crs_Configuration (bool PrintView) Deg_GetListDegsOfCurrentCtr (); /* Put form to select degree */ - Act_StartForm (ActChgCrsDegCfg); + Frm_StartForm (ActChgCrsDegCfg); fprintf (Gbl.F.Out,""); - Act_EndForm (); + Frm_EndForm (); /* Free list of degrees of the current centre */ Deg_FreeListDegs (&Gbl.CurrentCtr.Ctr.Degs); @@ -279,7 +280,7 @@ static void Crs_Configuration (bool PrintView) // Only degree admins, centre admins, institution admins and system admins can edit course full name { /* Form to change course full name */ - Act_StartForm (ActRenCrsFulCfg); + Frm_StartForm (ActRenCrsFulCfg); fprintf (Gbl.F.Out,"", Gbl.Form.Id); @@ -347,7 +348,7 @@ static void Crs_Configuration (bool PrintView) "", Txt_YEAR_OF_DEGREE[Year]); fprintf (Gbl.F.Out,""); - Act_EndForm (); + Frm_EndForm (); } else fprintf (Gbl.F.Out,"%s", @@ -368,7 +369,7 @@ static void Crs_Configuration (bool PrintView) Txt_Institutional_code); if (IsForm) { - Act_StartForm (ActChgInsCrsCodCfg); + Frm_StartForm (ActChgInsCrsCodCfg); fprintf (Gbl.F.Out,"", The_ClassForm[Gbl.Prefs.Theme], Txt_Indicators); - Act_StartForm (ActReqStaCrs); + Frm_StartForm (ActReqStaCrs); snprintf (Gbl.Title,sizeof (Gbl.Title), "%u %s %u", Indicators.NumIndicators, Txt_of_PART_OF_A_TOTAL,Ind_NUM_INDICATORS); - Act_LinkFormSubmit (Gbl.Title,"DAT",NULL); + Frm_LinkFormSubmit (Gbl.Title,"DAT",NULL); fprintf (Gbl.F.Out,"%s " "\"%s\""", @@ -463,7 +464,7 @@ static void Crs_Configuration (bool PrintView) (Indicators.NumIndicators == Ind_NUM_INDICATORS) ? "ok_green16x16.gif" : "warning64x64.png", Gbl.Title); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,"" ""); } @@ -562,9 +563,9 @@ static void Crs_WriteListMyCoursesToSelectOne (void) fprintf (Gbl.F.Out,"
  • ", Highlight ? ClassHighlight : ClassNormal); - Act_StartForm (ActMyCrs); + Frm_StartForm (ActMyCrs); Cty_PutParamCtyCod (-1L); - Act_LinkFormSubmit (Txt_System, + Frm_LinkFormSubmit (Txt_System, Highlight ? ClassHighlight : ClassNormal,NULL); fprintf (Gbl.F.Out,""); /***** Get my countries *****/ @@ -599,9 +600,9 @@ static void Crs_WriteListMyCoursesToSelectOne (void) ClassNormal); IsLastItemInLevel[1] = (NumCty == NumCtys - 1); Lay_IndentDependingOnLevel (1,IsLastItemInLevel); - Act_StartForm (ActMyCrs); + Frm_StartForm (ActMyCrs); Cty_PutParamCtyCod (Cty.CtyCod); - Act_LinkFormSubmit (Act_GetActionTextFromDB (Act_GetActCod (ActSeeCtyInf),ActTxt), + Frm_LinkFormSubmit (Act_GetActionTextFromDB (Act_GetActCod (ActSeeCtyInf),ActTxt), Highlight ? ClassHighlight : ClassNormal,NULL); /* Country map */ @@ -614,7 +615,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void) Cty.Alpha2, Cty.Name[Gbl.Prefs.Language], Cty.Name[Gbl.Prefs.Language]); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,"
    • "); /***** Get my institutions in this country *****/ @@ -640,14 +641,14 @@ static void Crs_WriteListMyCoursesToSelectOne (void) ClassNormal); IsLastItemInLevel[2] = (NumIns == NumInss - 1); Lay_IndentDependingOnLevel (2,IsLastItemInLevel); - Act_StartForm (ActMyCrs); + Frm_StartForm (ActMyCrs); Ins_PutParamInsCod (Ins.InsCod); - Act_LinkFormSubmit (Act_GetActionTextFromDB (Act_GetActCod (ActSeeInsInf),ActTxt), + Frm_LinkFormSubmit (Act_GetActionTextFromDB (Act_GetActCod (ActSeeInsInf),ActTxt), Highlight ? ClassHighlight : ClassNormal,NULL); Log_DrawLogo (Sco_SCOPE_INS,Ins.InsCod,Ins.ShrtName,20,NULL,true); fprintf (Gbl.F.Out," %s",Ins.FullName); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,""); /***** Get my centres in this institution *****/ @@ -673,14 +674,14 @@ static void Crs_WriteListMyCoursesToSelectOne (void) ClassNormal); IsLastItemInLevel[3] = (NumCtr == NumCtrs - 1); Lay_IndentDependingOnLevel (3,IsLastItemInLevel); - Act_StartForm (ActMyCrs); + Frm_StartForm (ActMyCrs); Ctr_PutParamCtrCod (Ctr.CtrCod); - Act_LinkFormSubmit (Act_GetActionTextFromDB (Act_GetActCod (ActSeeCtrInf),ActTxt), + Frm_LinkFormSubmit (Act_GetActionTextFromDB (Act_GetActCod (ActSeeCtrInf),ActTxt), Highlight ? ClassHighlight : ClassNormal,NULL); Log_DrawLogo (Sco_SCOPE_CTR,Ctr.CtrCod,Ctr.ShrtName,20,NULL,true); fprintf (Gbl.F.Out," %s",Ctr.FullName); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,""); /***** Get my degrees in this centre *****/ @@ -706,14 +707,14 @@ static void Crs_WriteListMyCoursesToSelectOne (void) ClassNormal); IsLastItemInLevel[4] = (NumDeg == NumDegs - 1); Lay_IndentDependingOnLevel (4,IsLastItemInLevel); - Act_StartForm (ActMyCrs); + Frm_StartForm (ActMyCrs); Deg_PutParamDegCod (Deg.DegCod); - Act_LinkFormSubmit (Act_GetActionTextFromDB (Act_GetActCod (ActSeeDegInf),ActTxt), + Frm_LinkFormSubmit (Act_GetActionTextFromDB (Act_GetActCod (ActSeeDegInf),ActTxt), Highlight ? ClassHighlight : ClassNormal,NULL); Log_DrawLogo (Sco_SCOPE_DEG,Deg.DegCod,Deg.ShrtName,20,NULL,true); fprintf (Gbl.F.Out," %s",Deg.FullName); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,""); /***** Get my courses in this degree *****/ @@ -738,12 +739,12 @@ static void Crs_WriteListMyCoursesToSelectOne (void) ClassNormal); IsLastItemInLevel[5] = (NumCrs == NumCrss - 1); Lay_IndentDependingOnLevel (5,IsLastItemInLevel); - Act_StartForm (ActMyCrs); + Frm_StartForm (ActMyCrs); Crs_PutParamCrsCod (Crs.CrsCod); snprintf (Gbl.Title,sizeof (Gbl.Title), Txt_Go_to_X, Crs.ShrtName); - Act_LinkFormSubmit (Gbl.Title, + Frm_LinkFormSubmit (Gbl.Title, Highlight ? ClassHighlight : ClassNormal,NULL); fprintf (Gbl.F.Out," 0) fprintf (Gbl.F.Out," onchange=\"document.getElementById('%s').submit();\"", @@ -943,7 +944,7 @@ void Crs_WriteSelectorOfCourse (void) /***** End form *****/ fprintf (Gbl.F.Out,""); - Act_EndForm (); + Frm_EndForm (); } /*****************************************************************************/ @@ -1061,7 +1062,7 @@ void Crs_WriteSelectorMyCoursesInBreadcrumb (void) Usr_GetMyCourses (); /***** Start form *****/ - Act_StartFormGoTo (Gbl.Usrs.Me.MyCrss.Num ? ActSeeCrsInf : + Frm_StartFormGoTo (Gbl.Usrs.Me.MyCrss.Num ? ActSeeCrsInf : ActSysReqSch); /***** Start selector of courses *****/ @@ -1121,7 +1122,7 @@ void Crs_WriteSelectorMyCoursesInBreadcrumb (void) /***** End form *****/ fprintf (Gbl.F.Out,""); - Act_EndForm (); + Frm_EndForm (); } /*****************************************************************************/ @@ -1167,10 +1168,10 @@ static void Crs_ListCourses (void) /***** Button to create course *****/ if (Crs_CheckIfICanCreateCourses ()) { - Act_StartForm (ActEdiCrs); + Frm_StartForm (ActEdiCrs); Btn_PutConfirmButton (Gbl.CurrentDeg.NumCrss ? Txt_Create_another_course : Txt_Create_course); - Act_EndForm (); + Frm_EndForm (); } /***** End box *****/ @@ -1287,15 +1288,15 @@ static bool Crs_ListCoursesOfAYearForSeeing (unsigned Year) /* Course full name */ fprintf (Gbl.F.Out,"", TxtClassStrong,BgColor); - Act_StartFormGoTo (ActSeeCrsInf); + Frm_StartFormGoTo (ActSeeCrsInf); Crs_PutParamCrsCod (Crs->CrsCod); snprintf (Gbl.Title,sizeof (Gbl.Title), Txt_Go_to_X, Crs->FullName); - Act_LinkFormSubmit (Gbl.Title,TxtClassStrong,NULL); + Frm_LinkFormSubmit (Gbl.Title,TxtClassStrong,NULL); fprintf (Gbl.F.Out,"%s", Crs->FullName); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,""); /* Current number of teachers in this course */ @@ -1434,10 +1435,10 @@ static void Crs_ListCoursesOfAYearForEdition (unsigned Year) Ico_PutIconRemovalNotAllowed (); else // Crs->NumUsrs == 0 && ICanEdit { - Act_StartForm (ActRemCrs); + Frm_StartForm (ActRemCrs); Crs_PutParamOtherCrsCod (Crs->CrsCod); Ico_PutIconRemove (); - Act_EndForm (); + Frm_EndForm (); } fprintf (Gbl.F.Out,""); @@ -1451,7 +1452,7 @@ static void Crs_ListCoursesOfAYearForEdition (unsigned Year) fprintf (Gbl.F.Out,""); if (ICanEdit) { - Act_StartForm (ActChgInsCrsCod); + Frm_StartForm (ActChgInsCrsCod); Crs_PutParamOtherCrsCod (Crs->CrsCod); fprintf (Gbl.F.Out,"InstitutionalCrsCod, Gbl.Form.Id); - Act_EndForm (); + Frm_EndForm (); } else fprintf (Gbl.F.Out,"%s",Crs->InstitutionalCrsCod); @@ -1470,7 +1471,7 @@ static void Crs_ListCoursesOfAYearForEdition (unsigned Year) fprintf (Gbl.F.Out,""); if (ICanEdit) { - Act_StartForm (ActChgCrsYea); + Frm_StartForm (ActChgCrsYea); Crs_PutParamOtherCrsCod (Crs->CrsCod); fprintf (Gbl.F.Out,"", Hie_MAX_CHARS_SHRT_NAME,Crs->ShrtName, Gbl.Form.Id); - Act_EndForm (); + Frm_EndForm (); } else fprintf (Gbl.F.Out,"%s",Crs->ShrtName); @@ -1513,7 +1514,7 @@ static void Crs_ListCoursesOfAYearForEdition (unsigned Year) fprintf (Gbl.F.Out,""); if (ICanEdit) { - Act_StartForm (ActRenCrsFul); + Frm_StartForm (ActRenCrsFul); Crs_PutParamOtherCrsCod (Crs->CrsCod); fprintf (Gbl.F.Out,"", Hie_MAX_CHARS_FULL_NAME,Crs->FullName, Gbl.Form.Id); - Act_EndForm (); + Frm_EndForm (); } else fprintf (Gbl.F.Out,"%s",Crs->FullName); @@ -1553,7 +1554,7 @@ static void Crs_ListCoursesOfAYearForEdition (unsigned Year) if (Gbl.Usrs.Me.Role.Logged >= Rol_DEG_ADM && StatusTxt == Crs_STATUS_PENDING) { - Act_StartForm (ActChgCrsSta); + Frm_StartForm (ActChgCrsSta); Crs_PutParamOtherCrsCod (Crs->CrsCod); fprintf (Gbl.F.Out,"", @@ -363,7 +364,7 @@ static void Deg_Configuration (bool PrintView) "", Gbl.Ctrs.Lst[NumCtr].ShrtName); fprintf (Gbl.F.Out,""); - Act_EndForm (); + Frm_EndForm (); /* Free list of centres */ Ctr_FreeListCentres (); @@ -388,7 +389,7 @@ static void Deg_Configuration (bool PrintView) // can edit degree full name { /* Form to change degree full name */ - Act_StartForm (ActRenDegFulCfg); + Frm_StartForm (ActRenDegFulCfg); fprintf (Gbl.F.Out,"" @@ -515,15 +516,15 @@ static void Deg_Configuration (bool PrintView) Txt_Courses); /* Form to go to see courses of this degree */ - Act_StartFormGoTo (ActSeeCrs); + Frm_StartFormGoTo (ActSeeCrs); Deg_PutParamDegCod (Gbl.CurrentDeg.Deg.DegCod); snprintf (Gbl.Title,sizeof (Gbl.Title), Txt_Courses_of_DEGREE_X, Gbl.CurrentDeg.Deg.ShrtName); - Act_LinkFormSubmit (Gbl.Title,"DAT",NULL); + Frm_LinkFormSubmit (Gbl.Title,"DAT",NULL); fprintf (Gbl.F.Out,"%u", Crs_GetNumCrssInDeg (Gbl.CurrentDeg.Deg.DegCod)); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,"" ""); @@ -597,7 +598,7 @@ void Deg_WriteSelectorOfDegree (void) long DegCod; /***** Start form *****/ - Act_StartFormGoTo (ActSeeCrs); + Frm_StartFormGoTo (ActSeeCrs); fprintf (Gbl.F.Out,""); - Act_EndForm (); + Frm_EndForm (); } /*****************************************************************************/ @@ -718,10 +719,10 @@ static void Deg_ListDegreesForEdition (void) Ico_PutIconRemovalNotAllowed (); else { - Act_StartForm (ActRemDeg); + Frm_StartForm (ActRemDeg); Deg_PutParamOtherDegCod (Deg->DegCod); Ico_PutIconRemove (); - Act_EndForm (); + Frm_EndForm (); } fprintf (Gbl.F.Out,""); @@ -741,14 +742,14 @@ static void Deg_ListDegreesForEdition (void) fprintf (Gbl.F.Out,""); if (ICanEdit) { - Act_StartForm (ActRenDegSho); + Frm_StartForm (ActRenDegSho); Deg_PutParamOtherDegCod (Deg->DegCod); fprintf (Gbl.F.Out,"", Hie_MAX_CHARS_SHRT_NAME,Deg->ShrtName,Gbl.Form.Id); - Act_EndForm (); + Frm_EndForm (); } else fprintf (Gbl.F.Out,"%s",Deg->ShrtName); @@ -758,14 +759,14 @@ static void Deg_ListDegreesForEdition (void) fprintf (Gbl.F.Out,""); if (ICanEdit) { - Act_StartForm (ActRenDegFul); + Frm_StartForm (ActRenDegFul); Deg_PutParamOtherDegCod (Deg->DegCod); fprintf (Gbl.F.Out,"", Hie_MAX_CHARS_FULL_NAME,Deg->FullName,Gbl.Form.Id); - Act_EndForm (); + Frm_EndForm (); } else fprintf (Gbl.F.Out,"%s",Deg->FullName); @@ -775,7 +776,7 @@ static void Deg_ListDegreesForEdition (void) fprintf (Gbl.F.Out,""); if (ICanEdit) { - Act_StartForm (ActChgDegTyp); + Frm_StartForm (ActChgDegTyp); Deg_PutParamOtherDegCod (Deg->DegCod); fprintf (Gbl.F.Out,""); - Act_EndForm (); + Frm_EndForm (); } else for (NumDegTyp = 0; @@ -807,14 +808,14 @@ static void Deg_ListDegreesForEdition (void) fprintf (Gbl.F.Out,""); if (ICanEdit) { - Act_StartForm (ActChgDegWWW); + Frm_StartForm (ActChgDegWWW); Deg_PutParamOtherDegCod (Deg->DegCod); fprintf (Gbl.F.Out,"", Cns_MAX_CHARS_WWW,Deg->WWW,Gbl.Form.Id); - Act_EndForm (); + Frm_EndForm (); } else { @@ -849,7 +850,7 @@ static void Deg_ListDegreesForEdition (void) if (Gbl.Usrs.Me.Role.Logged >= Rol_CTR_ADM && StatusTxt == Deg_STATUS_PENDING) { - Act_StartForm (ActChgDegSta); + Frm_StartForm (ActChgDegSta); Deg_PutParamOtherDegCod (Deg->DegCod); fprintf (Gbl.F.Out,""); /* Number of degrees of this type */ @@ -431,7 +432,7 @@ void DT_PutFormToCreateDegreeType (void) extern const char *Txt_Create_type_of_degree; /***** Start form *****/ - Act_StartForm (ActNewDegTyp); + Frm_StartForm (ActNewDegTyp); /***** Start box and table *****/ Box_StartBoxTable (NULL,Txt_New_type_of_degree,NULL, @@ -465,7 +466,7 @@ void DT_PutFormToCreateDegreeType (void) Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_type_of_degree); /***** End form *****/ - Act_EndForm (); + Frm_EndForm (); } /*****************************************************************************/ @@ -489,13 +490,13 @@ static void DT_PutHeadDegreeTypesForSeeing (Act_Action_t NextAction,DT_Order_t S "RIGHT_MIDDLE"); /* Start form to change order */ - Act_StartForm (NextAction); + Frm_StartForm (NextAction); if (NextAction == ActSeeUseGbl) Sta_PutHiddenParamFigures (); Par_PutHiddenParamUnsigned ("Order",(unsigned) Order); /* Link with the head of this column */ - Act_LinkFormSubmit (Txt_DEGREE_TYPES_HELP_ORDER[Order],"TIT_TBL",NULL); + Frm_LinkFormSubmit (Txt_DEGREE_TYPES_HELP_ORDER[Order],"TIT_TBL",NULL); if (Order == SelectedOrder) fprintf (Gbl.F.Out,""); fprintf (Gbl.F.Out,"%s",Txt_DEGREE_TYPES_ORDER[Order]); @@ -504,7 +505,7 @@ static void DT_PutHeadDegreeTypesForSeeing (Act_Action_t NextAction,DT_Order_t S fprintf (Gbl.F.Out,""); /* End form */ - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,""); } diff --git a/swad_department.c b/swad_department.c index 7277a571..6dc54bd7 100644 --- a/swad_department.c +++ b/swad_department.c @@ -36,6 +36,7 @@ #include "swad_constant.h" #include "swad_database.h" #include "swad_department.h" +#include "swad_form.h" #include "swad_global.h" #include "swad_institution.h" #include "swad_parameter.h" @@ -115,16 +116,16 @@ void Dpt_SeeDepts (void) Order++) { fprintf (Gbl.F.Out,""); - Act_StartForm (ActSeeDpt); + Frm_StartForm (ActSeeDpt); Par_PutHiddenParamUnsigned ("Order",(unsigned) Order); - Act_LinkFormSubmit (Txt_DEPARTMENTS_HELP_ORDER[Order],"TIT_TBL",NULL); + Frm_LinkFormSubmit (Txt_DEPARTMENTS_HELP_ORDER[Order],"TIT_TBL",NULL); if (Order == Gbl.Dpts.SelectedOrder) fprintf (Gbl.F.Out,""); fprintf (Gbl.F.Out,"%s",Txt_DEPARTMENTS_ORDER[Order]); if (Order == Gbl.Dpts.SelectedOrder) fprintf (Gbl.F.Out,""); fprintf (Gbl.F.Out,""); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,""); } fprintf (Gbl.F.Out,""); @@ -491,10 +492,10 @@ static void Dpt_ListDepartmentsForEdition (void) Ico_PutIconRemovalNotAllowed (); else { - Act_StartForm (ActRemDpt); + Frm_StartForm (ActRemDpt); Dpt_PutParamDptCod (Dpt->DptCod); Ico_PutIconRemove (); - Act_EndForm (); + Frm_EndForm (); } fprintf (Gbl.F.Out,""); @@ -506,7 +507,7 @@ static void Dpt_ListDepartmentsForEdition (void) /* Institution */ fprintf (Gbl.F.Out,""); - Act_StartForm (ActChgDptIns); + Frm_StartForm (ActChgDptIns); Dpt_PutParamDptCod (Dpt->DptCod); fprintf (Gbl.F.Out,""); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,""); /* Department short name */ fprintf (Gbl.F.Out,""); - Act_StartForm (ActRenDptSho); + Frm_StartForm (ActRenDptSho); Dpt_PutParamDptCod (Dpt->DptCod); fprintf (Gbl.F.Out,"", Hie_MAX_CHARS_SHRT_NAME,Dpt->ShrtName,Gbl.Form.Id); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,""); /* Department full name */ fprintf (Gbl.F.Out,""); - Act_StartForm (ActRenDptFul); + Frm_StartForm (ActRenDptFul); Dpt_PutParamDptCod (Dpt->DptCod); fprintf (Gbl.F.Out,"", Hie_MAX_CHARS_FULL_NAME,Dpt->FullName,Gbl.Form.Id); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,""); /* Department WWW */ fprintf (Gbl.F.Out,""); - Act_StartForm (ActChgDptWWW); + Frm_StartForm (ActChgDptWWW); Dpt_PutParamDptCod (Dpt->DptCod); fprintf (Gbl.F.Out,"", Cns_MAX_CHARS_WWW,Dpt->WWW,Gbl.Form.Id); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,""); /* Number of teachers */ @@ -865,7 +866,7 @@ static void Dpt_PutFormToCreateDepartment (void) Dpt = &Gbl.Dpts.EditingDpt; /***** Start form *****/ - Act_StartForm (ActNewDpt); + Frm_StartForm (ActNewDpt); /***** Start box and table *****/ Box_StartBoxTable (NULL,Txt_New_department,NULL, @@ -942,7 +943,7 @@ static void Dpt_PutFormToCreateDepartment (void) Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_department); /***** End form *****/ - Act_EndForm (); + Frm_EndForm (); } /*****************************************************************************/ diff --git a/swad_duplicate.c b/swad_duplicate.c index 76b80e7a..5c95cb1c 100644 --- a/swad_duplicate.c +++ b/swad_duplicate.c @@ -33,6 +33,7 @@ #include "swad_database.h" #include "swad_duplicate.h" #include "swad_enrolment.h" +#include "swad_form.h" #include "swad_global.h" #include "swad_layout.h" #include "swad_profile.h" @@ -403,10 +404,10 @@ static void Dup_PutButtonToViewSimilarUsrs (const struct UsrData *UsrDat) { extern const char *Txt_Similar_users; - Act_StartForm (ActLstSimUsr); + Frm_StartForm (ActLstSimUsr); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); Btn_PutConfirmButtonInline (Txt_Similar_users); - Act_EndForm (); + Frm_EndForm (); } /*****************************************************************************/ @@ -417,11 +418,11 @@ static void Dup_PutButtonToEliminateUsrAccount (const struct UsrData *UsrDat) { extern const char *Txt_Eliminate_user_account; - Act_StartForm (ActUpdOth); + Frm_StartForm (ActUpdOth); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); Par_PutHiddenParamUnsigned ("RegRemAction",(unsigned) Enr_ELIMINATE_ONE_USR_FROM_PLATFORM); Btn_PutRemoveButtonInline (Txt_Eliminate_user_account); - Act_EndForm (); + Frm_EndForm (); } /*****************************************************************************/ @@ -432,10 +433,10 @@ static void Dup_PutButtonToRemoveFromListOfDupUsrs (const struct UsrData *UsrDat { extern const char *Txt_Not_duplicated; - Act_StartForm (ActRemDupUsr); + Frm_StartForm (ActRemDupUsr); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); Btn_PutConfirmButtonInline (Txt_Not_duplicated); - Act_EndForm (); + Frm_EndForm (); } /*****************************************************************************/ diff --git a/swad_enrolment.c b/swad_enrolment.c index ae202ef7..fe4c223e 100644 --- a/swad_enrolment.c +++ b/swad_enrolment.c @@ -36,6 +36,7 @@ #include "swad_database.h" #include "swad_duplicate.h" #include "swad_enrolment.h" +#include "swad_form.h" #include "swad_global.h" #include "swad_ID.h" #include "swad_notification.h" @@ -181,10 +182,10 @@ void Enr_PutButtonInlineToRegisterStds (long CrsCod) if (Rol_GetRoleUsrInCrs (Gbl.Usrs.Me.UsrDat.UsrCod,CrsCod) == Rol_TCH) // I am a teacher in course if (!Usr_GetNumUsrsInCrs (Rol_STD,CrsCod)) // No students in course { - Act_StartForm (ActReqEnrSevStd); + Frm_StartForm (ActReqEnrSevStd); Crs_PutParamCrsCod (CrsCod); Btn_PutCreateButtonInline (Txt_Register_students); - Act_EndForm (); + Frm_EndForm (); } } @@ -356,7 +357,7 @@ void Enr_WriteFormToReqAnotherUsrID (Act_Action_t NextAction,void (*FuncParams) extern const char *Txt_Continue; /***** Form to request user's ID, @nickname or email address *****/ - Act_StartForm (NextAction); + Frm_StartForm (NextAction); if (FuncParams) FuncParams (); fprintf (Gbl.F.Out,"
    "); @@ -4138,19 +4139,19 @@ static void Brw_PutButtonToShowEdit (void) case Brw_ICON_VIEW: if (Brw_ActFromAdmToSee[Gbl.FileBrowser.Type] != ActUnk) { - Act_StartForm (Brw_ActFromAdmToSee[Gbl.FileBrowser.Type]); + Frm_StartForm (Brw_ActFromAdmToSee[Gbl.FileBrowser.Type]); Brw_PutHiddenParamFullTreeIfSelected (); Btn_PutConfirmButton (Txt_View); - Act_EndForm (); + Frm_EndForm (); } break; case Brw_ICON_EDIT: if (Brw_ActFromSeeToAdm[Gbl.FileBrowser.Type] != ActUnk) { - Act_StartForm (Brw_ActFromSeeToAdm[Gbl.FileBrowser.Type]); + Frm_StartForm (Brw_ActFromSeeToAdm[Gbl.FileBrowser.Type]); Brw_PutHiddenParamFullTreeIfSelected (); Btn_PutConfirmButton (Txt_Edit); - Act_EndForm (); + Frm_EndForm (); } break; } @@ -6068,15 +6069,21 @@ static bool Brw_WriteRowFileBrowser (unsigned Level,const char *RowId, // then Gbl.FileBrowser.Priv.FullPathInTree will be "descarga/teoria/tema1.pdf" // If FilFolLnkName is ".", then Gbl.FileBrowser.Priv.FullPathInTree will be equal to PathInTreeUntilFileOrFolder -void Brw_SetFullPathInTree (const char *PathInTreeUntilFileOrFolder,const char *FilFolLnkName) +void Brw_SetFullPathInTree (const char PathInTreeUntilFileOrFolder[PATH_MAX + 1], + const char FilFolLnkName[NAME_MAX + 1]) { + char FullPath[PATH_MAX + 1 + NAME_MAX + 1]; + if (!PathInTreeUntilFileOrFolder[0]) Gbl.FileBrowser.Priv.FullPathInTree[0] = '\0'; else if (strcmp (FilFolLnkName,".")) - snprintf (Gbl.FileBrowser.Priv.FullPathInTree, - sizeof (Gbl.FileBrowser.Priv.FullPathInTree), + { + snprintf (FullPath,sizeof (FullPath), "%s/%s", PathInTreeUntilFileOrFolder,FilFolLnkName); + Str_Copy (Gbl.FileBrowser.Priv.FullPathInTree,FullPath, + PATH_MAX); + } else // It's the root folder Str_Copy (Gbl.FileBrowser.Priv.FullPathInTree,PathInTreeUntilFileOrFolder, PATH_MAX); @@ -6188,7 +6195,7 @@ static void Brw_PutIconRemoveFile (const char PathInTree[PATH_MAX + 1], if (Gbl.FileBrowser.ICanEditFileOrFolder) // Can I remove this file? { /***** Form to remove a file *****/ - Act_StartForm (Brw_ActAskRemoveFile[Gbl.FileBrowser.Type]); + Frm_StartForm (Brw_ActAskRemoveFile[Gbl.FileBrowser.Type]); Brw_PutParamsFileBrowser (Brw_ActAskRemoveFile[Gbl.FileBrowser.Type], PathInTree,FileName, Gbl.FileBrowser.FileType,-1L); @@ -6201,7 +6208,7 @@ static void Brw_PutIconRemoveFile (const char PathInTree[PATH_MAX + 1], Gbl.Prefs.IconsURL, Gbl.Title, Gbl.Title); - Act_EndForm (); + Frm_EndForm (); } else // Ico_PutIconBRemovalNotAllowed (); @@ -6223,7 +6230,7 @@ static void Brw_PutIconRemoveDir (const char PathInTree[PATH_MAX + 1], if (Gbl.FileBrowser.ICanEditFileOrFolder) // Can I remove this folder? { /***** Form to remove a folder *****/ - Act_StartForm (Brw_ActRemoveFolder[Gbl.FileBrowser.Type]); + Frm_StartForm (Brw_ActRemoveFolder[Gbl.FileBrowser.Type]); Brw_PutParamsFileBrowser (Brw_ActRemoveFolder[Gbl.FileBrowser.Type], PathInTree,FileName, Brw_IS_FOLDER,-1L); @@ -6236,7 +6243,7 @@ static void Brw_PutIconRemoveDir (const char PathInTree[PATH_MAX + 1], Gbl.Prefs.IconsURL, Gbl.Title, Gbl.Title); - Act_EndForm (); + Frm_EndForm (); } else // Ico_PutIconBRemovalNotAllowed (); @@ -6256,7 +6263,7 @@ static void Brw_PutIconCopy (const char PathInTree[PATH_MAX + 1], fprintf (Gbl.F.Out,"",Gbl.RowEvenOdd); /***** Form to copy into the clipboard *****/ - Act_StartForm (Brw_ActCopy[Gbl.FileBrowser.Type]); + Frm_StartForm (Brw_ActCopy[Gbl.FileBrowser.Type]); Brw_PutParamsFileBrowser (Brw_ActCopy[Gbl.FileBrowser.Type], PathInTree,FileName, Gbl.FileBrowser.FileType,-1L); @@ -6269,7 +6276,7 @@ static void Brw_PutIconCopy (const char PathInTree[PATH_MAX + 1], Gbl.Prefs.IconsURL, Gbl.Title, Gbl.Title); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,""); } @@ -6286,7 +6293,7 @@ static void Brw_PutIconPasteOn (const char PathInTree[PATH_MAX + 1], fprintf (Gbl.F.Out,"",Gbl.RowEvenOdd); /***** Form to paste the content of the clipboard *****/ - Act_StartForm (Brw_ActPaste[Gbl.FileBrowser.Type]); + Frm_StartForm (Brw_ActPaste[Gbl.FileBrowser.Type]); Brw_PutParamsFileBrowser (Brw_ActPaste[Gbl.FileBrowser.Type], PathInTree,FileName, Brw_IS_FOLDER,-1L); @@ -6299,7 +6306,7 @@ static void Brw_PutIconPasteOn (const char PathInTree[PATH_MAX + 1], Gbl.Prefs.IconsURL, Gbl.Title, Gbl.Title); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,""); } @@ -6420,7 +6427,7 @@ static void Brw_PutIconToExpandFolder (const char *FileBrowserId,const char *Row snprintf (JavaScriptFuncToExpandFolder,sizeof (JavaScriptFuncToExpandFolder), "ExpandFolder('%s_%s')", FileBrowserId,RowId); - Act_StartFormAnchorOnSubmit (Brw_ActExpandFolder[Gbl.FileBrowser.Type], + Frm_StartFormAnchorOnSubmit (Brw_ActExpandFolder[Gbl.FileBrowser.Type], FileBrowserId, JavaScriptFuncToExpandFolder); // JavaScript function to unhide rows Brw_PutParamsFileBrowser (Brw_ActExpandFolder[Gbl.FileBrowser.Type], @@ -6435,7 +6442,7 @@ static void Brw_PutIconToExpandFolder (const char *FileBrowserId,const char *Row Gbl.Prefs.IconsURL, Gbl.Title, Gbl.Title); - Act_EndForm (); + Frm_EndForm (); /***** End container *****/ fprintf (Gbl.F.Out,""); @@ -6465,7 +6472,7 @@ static void Brw_PutIconToContractFolder (const char *FileBrowserId,const char *R snprintf (JavaScriptFuncToContractFolder,sizeof (JavaScriptFuncToContractFolder), "ContractFolder('%s_%s')", FileBrowserId,RowId); - Act_StartFormAnchorOnSubmit (Brw_ActContractFolder[Gbl.FileBrowser.Type], + Frm_StartFormAnchorOnSubmit (Brw_ActContractFolder[Gbl.FileBrowser.Type], FileBrowserId, JavaScriptFuncToContractFolder); // JavaScript function to hide rows Brw_PutParamsFileBrowser (Brw_ActContractFolder[Gbl.FileBrowser.Type], @@ -6480,7 +6487,7 @@ static void Brw_PutIconToContractFolder (const char *FileBrowserId,const char *R Gbl.Prefs.IconsURL, Gbl.Title, Gbl.Title); - Act_EndForm (); + Frm_EndForm (); /***** End container *****/ fprintf (Gbl.F.Out,""); @@ -6495,7 +6502,7 @@ static void Brw_PutIconShow (unsigned Level,const char *PathInTree,const char *F extern const char *Txt_Show_FOLDER_FILE_OR_LINK_X; fprintf (Gbl.F.Out,"",Gbl.RowEvenOdd); - Act_StartForm (Brw_ActShow[Gbl.FileBrowser.Type]); + Frm_StartForm (Brw_ActShow[Gbl.FileBrowser.Type]); Brw_PutParamsFileBrowser (ActUnk, PathInTree,FileName, Gbl.FileBrowser.FileType,-1L); @@ -6510,7 +6517,7 @@ static void Brw_PutIconShow (unsigned Level,const char *PathInTree,const char *F "on", Gbl.Title, Gbl.Title); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,""); } @@ -6523,7 +6530,7 @@ static void Brw_PutIconHide (unsigned Level,const char *PathInTree,const char *F extern const char *Txt_Hide_FOLDER_FILE_OR_LINK_X; fprintf (Gbl.F.Out,"",Gbl.RowEvenOdd); - Act_StartForm (Brw_ActHide[Gbl.FileBrowser.Type]); + Frm_StartForm (Brw_ActHide[Gbl.FileBrowser.Type]); Brw_PutParamsFileBrowser (ActUnk, PathInTree,FileName, Gbl.FileBrowser.FileType,-1L); @@ -6538,7 +6545,7 @@ static void Brw_PutIconHide (unsigned Level,const char *PathInTree,const char *F "on", Gbl.Title, Gbl.Title); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,""); } @@ -6694,7 +6701,7 @@ static void Brw_PutIconFolderWithPlus (const char *FileBrowserId,const char *Row fprintf (Gbl.F.Out,">"); /***** Form and icon *****/ - Act_StartForm (Brw_ActFormCreate[Gbl.FileBrowser.Type]); + Frm_StartForm (Brw_ActFormCreate[Gbl.FileBrowser.Type]); Brw_PutParamsFileBrowser (Brw_ActFormCreate[Gbl.FileBrowser.Type], PathInTree,FileName, Brw_IS_FOLDER,-1L); @@ -6710,7 +6717,7 @@ static void Brw_PutIconFolderWithPlus (const char *FileBrowserId,const char *Row "closed", Gbl.Title, Gbl.Title); - Act_EndForm (); + Frm_EndForm (); /***** End container *****/ fprintf (Gbl.F.Out,""); @@ -6746,7 +6753,7 @@ static void Brw_PutIconFileWithLinkToViewMetadata (unsigned Size, { extern const char *Txt_View_data_of_FILE_OR_LINK_X; - Act_StartForm (Brw_ActReqDatFile[Gbl.FileBrowser.Type]); + Frm_StartForm (Brw_ActReqDatFile[Gbl.FileBrowser.Type]); Brw_PutParamsFileBrowser (Brw_ActReqDatFile[Gbl.FileBrowser.Type], NULL,NULL, Brw_IS_UNKNOWN, // Not used @@ -6758,14 +6765,14 @@ static void Brw_PutIconFileWithLinkToViewMetadata (unsigned Size, FileNameToShow); /* Link to the form and to the file */ - Act_LinkFormSubmit (Gbl.Title,Gbl.FileBrowser.TxtStyle,NULL); + Frm_LinkFormSubmit (Gbl.Title,Gbl.FileBrowser.TxtStyle,NULL); /***** Icon depending on the file extension *****/ Brw_PutIconFile (Size,FileMetadata->FileType,FileMetadata->FilFolLnkName); /* End link and form */ fprintf (Gbl.F.Out,""); - Act_EndForm (); + Frm_EndForm (); } /*****************************************************************************/ @@ -6835,7 +6842,7 @@ static void Brw_WriteFileName (unsigned Level,bool IsPublic, /***** Form to rename folder *****/ if (Gbl.FileBrowser.ICanEditFileOrFolder) // Can I rename this folder? { - Act_StartForm (Brw_ActRenameFolder[Gbl.FileBrowser.Type]); + Frm_StartForm (Brw_ActRenameFolder[Gbl.FileBrowser.Type]); Brw_PutParamsFileBrowser (Brw_ActRenameFolder[Gbl.FileBrowser.Type], PathInTree,FileName, Brw_IS_FOLDER,-1L); @@ -6854,7 +6861,7 @@ static void Brw_WriteFileName (unsigned Level,bool IsPublic, Gbl.FileBrowser.Clipboard.IsThisFile ? "LIGHT_GREEN" : Gbl.ColorRows[Gbl.RowEvenOdd], Gbl.Form.Id); - Act_EndForm (); + Frm_EndForm (); } else { @@ -6885,7 +6892,7 @@ static void Brw_WriteFileName (unsigned Level,bool IsPublic, fprintf (Gbl.F.Out,"
    "); - Act_StartForm (Brw_ActDowFile[Gbl.FileBrowser.Type]); + Frm_StartForm (Brw_ActDowFile[Gbl.FileBrowser.Type]); Brw_PutParamsFileBrowser (Brw_ActDowFile[Gbl.FileBrowser.Type], PathInTree,FileName, Gbl.FileBrowser.FileType,-1L); @@ -6896,10 +6903,10 @@ static void Brw_WriteFileName (unsigned Level,bool IsPublic, Gbl.FileBrowser.Type == Brw_SHOW_MRK_GRP) ? Txt_Check_marks_in_file_X : Txt_Download_FILE_OR_LINK_X, FileNameToShow); - Act_LinkFormSubmit (Gbl.Title,Gbl.FileBrowser.TxtStyle,NULL); + Frm_LinkFormSubmit (Gbl.Title,Gbl.FileBrowser.TxtStyle,NULL); fprintf (Gbl.F.Out,"%s", FileNameToShow); - Act_EndForm (); + Frm_EndForm (); /* Put icon to make public/private file */ if (IsPublic) @@ -8970,7 +8977,7 @@ static void Brw_PutFormToCreateAFolder (const char FileNameToShow[NAME_MAX + 1]) extern const char *Txt_Folder; /***** Start form *****/ - Act_StartForm (Brw_ActCreateFolder[Gbl.FileBrowser.Type]); + Frm_StartForm (Brw_ActCreateFolder[Gbl.FileBrowser.Type]); Brw_PutParamsFileBrowser (Brw_ActCreateFolder[Gbl.FileBrowser.Type], Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk, Gbl.FileBrowser.FilFolLnkName, @@ -8998,7 +9005,7 @@ static void Brw_PutFormToCreateAFolder (const char FileNameToShow[NAME_MAX + 1]) Box_EndBoxWithButton (Btn_CREATE_BUTTON,Txt_Create_folder); /***** End form *****/ - Act_EndForm (); + Frm_EndForm (); } /*****************************************************************************/ @@ -9050,7 +9057,7 @@ static void Brw_PutFormToUploadFilesUsingDropzone (const char *FileNameToShow) Txt_Select_one_or_more_files_from_your_computer_or_drag_and_drop_here); /***** Put button to refresh file browser after upload *****/ - Act_StartForm (Brw_ActRefreshAfterUploadFiles[Gbl.FileBrowser.Type]); + Frm_StartForm (Brw_ActRefreshAfterUploadFiles[Gbl.FileBrowser.Type]); Brw_PutParamsFileBrowser (Brw_ActRefreshAfterUploadFiles[Gbl.FileBrowser.Type], NULL,NULL, Brw_IS_UNKNOWN, // Not used @@ -9060,7 +9067,7 @@ static void Brw_PutFormToUploadFilesUsingDropzone (const char *FileNameToShow) Btn_PutConfirmButton (Txt_Done); /***** End form *****/ - Act_EndForm (); + Frm_EndForm (); /***** End box *****/ Box_EndBox (); @@ -9088,7 +9095,7 @@ static void Brw_PutFormToUploadOneFileClassic (const char *FileNameToShow) Ale_ShowAlert (Ale_INFO,Gbl.Alert.Txt); /***** Form to upload one files using the classic way *****/ - Act_StartForm (Brw_ActUploadFileClassic[Gbl.FileBrowser.Type]); + Frm_StartForm (Brw_ActUploadFileClassic[Gbl.FileBrowser.Type]); Brw_PutParamsFileBrowser (Brw_ActUploadFileClassic[Gbl.FileBrowser.Type], Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk, Gbl.FileBrowser.FilFolLnkName, @@ -9098,7 +9105,7 @@ static void Brw_PutFormToUploadOneFileClassic (const char *FileNameToShow) /* Button to send */ Btn_PutCreateButton (Txt_Upload_file); - Act_EndForm (); + Frm_EndForm (); /***** End box *****/ Box_EndBox (); @@ -9115,7 +9122,7 @@ static void Brw_PutFormToPasteAFileOrFolder (const char *FileNameToShow) extern const char *Txt_or_you_can_make_a_file_copy_to_the_folder_X; /***** Start form *****/ - Act_StartForm (Brw_ActPaste[Gbl.FileBrowser.Type]); + Frm_StartForm (Brw_ActPaste[Gbl.FileBrowser.Type]); Brw_PutParamsFileBrowser (Brw_ActPaste[Gbl.FileBrowser.Type], Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk, Gbl.FileBrowser.FilFolLnkName, @@ -9135,7 +9142,7 @@ static void Brw_PutFormToPasteAFileOrFolder (const char *FileNameToShow) Box_EndBoxWithButton (Btn_CREATE_BUTTON,Txt_Paste); /***** End form *****/ - Act_EndForm (); + Frm_EndForm (); } /*****************************************************************************/ @@ -9152,7 +9159,7 @@ static void Brw_PutFormToCreateALink (const char *FileNameToShow) extern const char *Txt_optional; /***** Start form *****/ - Act_StartForm (Brw_ActCreateLink[Gbl.FileBrowser.Type]); + Frm_StartForm (Brw_ActCreateLink[Gbl.FileBrowser.Type]); Brw_PutParamsFileBrowser (Brw_ActCreateLink[Gbl.FileBrowser.Type], Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk, Gbl.FileBrowser.FilFolLnkName, @@ -9207,7 +9214,7 @@ static void Brw_PutFormToCreateALink (const char *FileNameToShow) Box_EndBoxWithButton (Btn_CREATE_BUTTON,Txt_Create_link); /***** End form *****/ - Act_EndForm (); + Frm_EndForm (); } /*****************************************************************************/ @@ -10234,7 +10241,7 @@ void Brw_ShowFileMetadata (void) break; } - Act_StartForm (Brw_ActRecDatFile[Gbl.FileBrowser.Type]); + Frm_StartForm (Brw_ActRecDatFile[Gbl.FileBrowser.Type]); Brw_PutParamsFileBrowser (Brw_ActRecDatFile[Gbl.FileBrowser.Type], FileMetadata.PathInTreeUntilFilFolLnk, FileMetadata.FilFolLnkName, @@ -10429,7 +10436,7 @@ void Brw_ShowFileMetadata (void) Box_EndBoxTableWithButton (Btn_CONFIRM_BUTTON,Txt_Save_file_properties); /* End form */ - Act_EndForm (); + Frm_EndForm (); } else /* End table and box */ @@ -10751,7 +10758,7 @@ static void Brw_WriteBigLinkToDownloadFile (const char *URL, Gbl.FileBrowser.Type == Brw_SHOW_MRK_GRP) { /* Form to see marks */ - Act_StartForm (Gbl.FileBrowser.Type == Brw_SHOW_MRK_CRS ? ActSeeMyMrkCrs : + Frm_StartForm (Gbl.FileBrowser.Type == Brw_SHOW_MRK_CRS ? ActSeeMyMrkCrs : ActSeeMyMrkGrp); Brw_PutParamsFileBrowser (ActUnk, FileMetadata->PathInTreeUntilFilFolLnk, @@ -10762,7 +10769,7 @@ static void Brw_WriteBigLinkToDownloadFile (const char *URL, snprintf (Gbl.Title,sizeof (Gbl.Title), Txt_Check_marks_in_file_X, FileNameToShow); - Act_LinkFormSubmit (Gbl.Title,"FILENAME_TXT",NULL); + Frm_LinkFormSubmit (Gbl.Title,"FILENAME_TXT",NULL); Brw_PutIconFile (32,FileMetadata->FileType,FileMetadata->FilFolLnkName); /* Name of the file of marks, link end and form end */ @@ -10773,7 +10780,7 @@ static void Brw_WriteBigLinkToDownloadFile (const char *URL, "", FileNameToShow,Gbl.Prefs.IconsURL, Gbl.Title,Gbl.Title); - Act_EndForm (); + Frm_EndForm (); } else { @@ -10809,7 +10816,7 @@ static void Brw_WriteSmallLinkToDownloadFile (const char *URL,Brw_FileType_t Fil Gbl.FileBrowser.Type == Brw_SHOW_MRK_GRP) { /* Form to see marks */ - Act_StartForm (Gbl.FileBrowser.Type == Brw_SHOW_MRK_CRS ? ActSeeMyMrkCrs : + Frm_StartForm (Gbl.FileBrowser.Type == Brw_SHOW_MRK_CRS ? ActSeeMyMrkCrs : ActSeeMyMrkGrp); Brw_PutParamsFileBrowser (ActUnk, Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk, @@ -10820,11 +10827,11 @@ static void Brw_WriteSmallLinkToDownloadFile (const char *URL,Brw_FileType_t Fil snprintf (Gbl.Title,sizeof (Gbl.Title), Txt_Check_marks_in_file_X, FileNameToShow); - Act_LinkFormSubmit (Gbl.Title,"DAT",NULL); + Frm_LinkFormSubmit (Gbl.Title,"DAT",NULL); /* Name of the file of marks, link end and form end */ fprintf (Gbl.F.Out,"%s",FileNameToShow); - Act_EndForm (); + Frm_EndForm (); } else /* Put anchor and filename */ @@ -12713,15 +12720,15 @@ static void Brw_WriteRowDocData (unsigned long *NumDocsNotHidden,MYSQL_ROW row) BgColor); if (InsCod > 0) { - Act_StartFormGoTo (ActSeeInsInf); + Frm_StartFormGoTo (ActSeeInsInf); Deg_PutParamDegCod (InsCod); snprintf (Gbl.Title,sizeof (Gbl.Title), Txt_Go_to_X, InsShortName); - Act_LinkFormSubmit (Gbl.Title,"DAT",NULL); + Frm_LinkFormSubmit (Gbl.Title,"DAT",NULL); Log_DrawLogo (Sco_SCOPE_INS,InsCod,InsShortName,20,"CENTER_TOP",true); fprintf (Gbl.F.Out," %s",InsShortName); - Act_EndForm (); + Frm_EndForm (); } fprintf (Gbl.F.Out,""); @@ -12730,15 +12737,15 @@ static void Brw_WriteRowDocData (unsigned long *NumDocsNotHidden,MYSQL_ROW row) BgColor); if (CtrCod > 0) { - Act_StartFormGoTo (ActSeeCtrInf); + Frm_StartFormGoTo (ActSeeCtrInf); Deg_PutParamDegCod (CtrCod); snprintf (Gbl.Title,sizeof (Gbl.Title), Txt_Go_to_X, CtrShortName); - Act_LinkFormSubmit (Gbl.Title,"DAT",NULL); + Frm_LinkFormSubmit (Gbl.Title,"DAT",NULL); Log_DrawLogo (Sco_SCOPE_CTR,CtrCod,CtrShortName,20,"CENTER_TOP",true); fprintf (Gbl.F.Out," %s",CtrShortName); - Act_EndForm (); + Frm_EndForm (); } fprintf (Gbl.F.Out,""); @@ -12747,15 +12754,15 @@ static void Brw_WriteRowDocData (unsigned long *NumDocsNotHidden,MYSQL_ROW row) BgColor); if (DegCod > 0) { - Act_StartFormGoTo (ActSeeDegInf); + Frm_StartFormGoTo (ActSeeDegInf); Deg_PutParamDegCod (DegCod); snprintf (Gbl.Title,sizeof (Gbl.Title), Txt_Go_to_X, DegShortName); - Act_LinkFormSubmit (Gbl.Title,"DAT",NULL); + Frm_LinkFormSubmit (Gbl.Title,"DAT",NULL); Log_DrawLogo (Sco_SCOPE_DEG,DegCod,DegShortName,20,"CENTER_TOP",true); fprintf (Gbl.F.Out," %s",DegShortName); - Act_EndForm (); + Frm_EndForm (); } fprintf (Gbl.F.Out,""); @@ -12764,14 +12771,14 @@ static void Brw_WriteRowDocData (unsigned long *NumDocsNotHidden,MYSQL_ROW row) BgColor); if (CrsCod > 0) { - Act_StartFormGoTo (ActSeeCrsInf); + Frm_StartFormGoTo (ActSeeCrsInf); Crs_PutParamCrsCod (CrsCod); snprintf (Gbl.Title,sizeof (Gbl.Title), Txt_Go_to_X, CrsShortName); - Act_LinkFormSubmit (Gbl.Title,"DAT",NULL); + Frm_LinkFormSubmit (Gbl.Title,"DAT",NULL); fprintf (Gbl.F.Out,"%s",CrsShortName); - Act_EndForm (); + Frm_EndForm (); } fprintf (Gbl.F.Out,""); @@ -12838,26 +12845,26 @@ static void Brw_WriteRowDocData (unsigned long *NumDocsNotHidden,MYSQL_ROW row) if (CrsCod > 0 && CrsCod != Gbl.CurrentCrs.Crs.CrsCod) // Not the current course { - Act_StartFormGoTo (Action); + Frm_StartFormGoTo (Action); Crs_PutParamCrsCod (CrsCod); // Go to another course } else if (DegCod > 0 && DegCod != Gbl.CurrentDeg.Deg.DegCod) // Not the current degree { - Act_StartFormGoTo (Action); + Frm_StartFormGoTo (Action); Deg_PutParamDegCod (DegCod); // Go to another degree } else if (CtrCod > 0 && CtrCod != Gbl.CurrentCtr.Ctr.CtrCod) // Not the current centre { - Act_StartFormGoTo (Action); + Frm_StartFormGoTo (Action); Ctr_PutParamCtrCod (CtrCod); // Go to another centre } else if (InsCod > 0 && InsCod != Gbl.CurrentIns.Ins.InsCod) // Not the current institution { - Act_StartFormGoTo (Action); + Frm_StartFormGoTo (Action); Ins_PutParamInsCod (InsCod); // Go to another institution } else - Act_StartForm (Action); + Frm_StartForm (Action); if (GrpCod > 0) Grp_PutParamGrpCod (GrpCod); @@ -12872,7 +12879,7 @@ static void Brw_WriteRowDocData (unsigned long *NumDocsNotHidden,MYSQL_ROW row) FileMetadata.FilCod); /* File or folder icon */ - Act_LinkFormSubmit (FileNameToShow,"DAT_N",NULL); + Frm_LinkFormSubmit (FileNameToShow,"DAT_N",NULL); if (FileMetadata.FileType == Brw_IS_FOLDER) /* Icon with folder */ fprintf (Gbl.F.Out,"" ""); @@ -12929,7 +12936,7 @@ void Brw_AskRemoveOldFiles (void) Brw_GetParAndInitFileBrowser (); /***** Start form *****/ - Act_StartForm (ActRemOldBrf); + Frm_StartForm (ActRemOldBrf); Brw_PutHiddenParamFullTreeIfSelected (); /***** Start box *****/ @@ -12959,7 +12966,7 @@ void Brw_AskRemoveOldFiles (void) Box_EndBoxWithButton (Btn_REMOVE_BUTTON,Txt_Remove); /***** End form *****/ - Act_EndForm (); + Frm_EndForm (); /***** Show again the file browser *****/ Brw_ShowAgainFileBrowserOrWorks (); diff --git a/swad_follow.c b/swad_follow.c index 97da1478..4d8e4cb0 100644 --- a/swad_follow.c +++ b/swad_follow.c @@ -33,6 +33,7 @@ #include "swad_box.h" #include "swad_database.h" #include "swad_follow.h" +#include "swad_form.h" #include "swad_global.h" #include "swad_notification.h" #include "swad_privacy.h" @@ -198,10 +199,10 @@ void Fol_SuggestUsrsToFollowMainZoneOnRightColumn (void) fprintf (Gbl.F.Out,"
    "); /***** Title with link to suggest more users to follow *****/ - Act_StartForm (ActSeeSocPrf); - Act_LinkFormSubmit (Txt_Who_to_follow,"CONNECTED_TXT",NULL); + Frm_StartForm (ActSeeSocPrf); + Frm_LinkFormSubmit (Txt_Who_to_follow,"CONNECTED_TXT",NULL); fprintf (Gbl.F.Out,"%s",Txt_Who_to_follow); - Act_EndForm (); + Frm_EndForm (); /***** Start table *****/ fprintf (Gbl.F.Out,""); @@ -428,11 +429,11 @@ static void Fol_PutIconToUpdateWhoToFollow (void) extern const char *The_ClassFormBold[The_NUM_THEMES]; extern const char *Txt_Update; - Act_StartForm (ActSeeSocPrf); - Act_LinkFormSubmitAnimated (Txt_Update,The_ClassFormBold[Gbl.Prefs.Theme], + Frm_StartForm (ActSeeSocPrf); + Frm_LinkFormSubmitAnimated (Txt_Update,The_ClassFormBold[Gbl.Prefs.Theme], NULL); Ico_PutCalculateIcon (Txt_Update); - Act_EndForm (); + Frm_EndForm (); } /*****************************************************************************/ @@ -532,9 +533,9 @@ void Fol_ShowFollowingAndFollowers (const struct UsrData *UsrDat, { if (IFollowUsr) // I follow this user { - Act_StartForm (ActUnfUsr); + Frm_StartForm (ActUnfUsr); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); - Act_LinkFormSubmit (Txt_Following_unfollow,"REC_DAT_BOLD",NULL); + Frm_LinkFormSubmit (Txt_Following_unfollow,"REC_DAT_BOLD",NULL); fprintf (Gbl.F.Out,"
    " "", Gbl.Prefs.IconsURL, Txt_Unfollow,Txt_Following_unfollow); - Act_EndForm (); + Frm_EndForm (); } else // I do not follow this user { - Act_StartForm (ActFolUsr); + Frm_StartForm (ActFolUsr); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); - Act_LinkFormSubmit (Txt_Follow,"REC_DAT_BOLD",NULL); + Frm_LinkFormSubmit (Txt_Follow,"REC_DAT_BOLD",NULL); fprintf (Gbl.F.Out,"
    " "", Gbl.Prefs.IconsURL, Txt_Follow,Txt_Follow); - Act_EndForm (); + Frm_EndForm (); } } fprintf (Gbl.F.Out,"
    "); @@ -592,9 +593,9 @@ static void Fol_ShowNumberOfFollowingOrFollowers (const struct UsrData *UsrDat, if (NumUsrs) { /* Form to list users */ - Act_StartFormAnchor (Action,Fol_FOLLOW_SECTION_ID); + Frm_StartFormAnchor (Action,Fol_FOLLOW_SECTION_ID); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); - Act_LinkFormSubmit (Title, + Frm_LinkFormSubmit (Title, (Gbl.Action.Act == Action) ? "FOLLOW_NUM_B" : "FOLLOW_NUM",NULL); } @@ -606,7 +607,7 @@ static void Fol_ShowNumberOfFollowingOrFollowers (const struct UsrData *UsrDat, if (NumUsrs) { fprintf (Gbl.F.Out,""); - Act_EndForm (); + Frm_EndForm (); } else fprintf (Gbl.F.Out,""); @@ -618,9 +619,9 @@ static void Fol_ShowNumberOfFollowingOrFollowers (const struct UsrData *UsrDat, if (NumUsrs) { /* Form to list users */ - Act_StartFormAnchor (Action,Fol_FOLLOW_SECTION_ID); + Frm_StartFormAnchor (Action,Fol_FOLLOW_SECTION_ID); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); - Act_LinkFormSubmit (Title, + Frm_LinkFormSubmit (Title, (Gbl.Action.Act == Action) ? The_ClassFormBold[Gbl.Prefs.Theme] : The_ClassForm[Gbl.Prefs.Theme],NULL); } @@ -628,7 +629,7 @@ static void Fol_ShowNumberOfFollowingOrFollowers (const struct UsrData *UsrDat, if (NumUsrs) { fprintf (Gbl.F.Out,""); - Act_EndForm (); + Frm_EndForm (); } fprintf (Gbl.F.Out,"
    "); @@ -842,14 +843,14 @@ static void Fol_ShowFollowedOrFollower (struct UsrData *UsrDat) if (Visible) { /* Put form to go to public profile */ - Act_StartForm (ActSeeOthPubPrf); + Frm_StartForm (ActSeeOthPubPrf); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); fprintf (Gbl.F.Out,"
    "); // Limited width - Act_LinkFormSubmit (Txt_Another_user_s_profile,"DAT",NULL); + Frm_LinkFormSubmit (Txt_Another_user_s_profile,"DAT",NULL); Usr_WriteFirstNameBRSurnames (UsrDat); fprintf (Gbl.F.Out,"" "
    "); - Act_EndForm (); + Frm_EndForm (); } ItsMe = Usr_ItsMe (UsrDat->UsrCod); @@ -902,14 +903,14 @@ static void Fol_WriteRowUsrToFollowOnRightColumn (struct UsrData *UsrDat) if (Visible) { /* Put form to go to public profile */ - Act_StartForm (ActSeeOthPubPrf); + Frm_StartForm (ActSeeOthPubPrf); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); fprintf (Gbl.F.Out,"
    "); // Limited width - Act_LinkFormSubmit (Txt_Another_user_s_profile,"CON_CRS",NULL); + Frm_LinkFormSubmit (Txt_Another_user_s_profile,"CON_CRS",NULL); Usr_WriteFirstNameBRSurnames (UsrDat); fprintf (Gbl.F.Out,"" "
    "); - Act_EndForm (); + Frm_EndForm (); } fprintf (Gbl.F.Out,""); @@ -961,9 +962,9 @@ static void Fol_PutIconToFollow (struct UsrData *UsrDat) extern const char *Txt_Follow; /***** Form to unfollow *****/ - Act_StartForm (ActFolUsr); + Frm_StartForm (ActFolUsr); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); - Act_LinkFormSubmit (Txt_Follow,NULL,NULL); + Frm_LinkFormSubmit (Txt_Follow,NULL,NULL); fprintf (Gbl.F.Out,"
    " "\"%s\"", Gbl.Prefs.IconsURL, Txt_Follow,Txt_Follow); - Act_EndForm (); + Frm_EndForm (); } /*****************************************************************************/ @@ -984,9 +985,9 @@ static void Fol_PutIconToUnfollow (struct UsrData *UsrDat) extern const char *Txt_Unfollow; /* Form to follow */ - Act_StartForm (ActUnfUsr); + Frm_StartForm (ActUnfUsr); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); - Act_LinkFormSubmit (Txt_Unfollow,NULL,NULL); + Frm_LinkFormSubmit (Txt_Unfollow,NULL,NULL); fprintf (Gbl.F.Out,"
    " "\"%s\"", Gbl.Prefs.IconsURL, Txt_Unfollow,Txt_Unfollow); - Act_EndForm (); + Frm_EndForm (); } /*****************************************************************************/ diff --git a/swad_forum.c b/swad_forum.c index a7d76e6c..85967b02 100644 --- a/swad_forum.c +++ b/swad_forum.c @@ -37,6 +37,7 @@ #include "swad_box.h" #include "swad_config.h" #include "swad_database.h" +#include "swad_form.h" #include "swad_forum.h" #include "swad_global.h" #include "swad_layout.h" @@ -1224,7 +1225,7 @@ static void For_ShowAForumPost (unsigned PstNum,long PstCod, "
    "); @@ -1762,7 +1763,7 @@ static void For_PutFormWhichForums (void) /***** Form to select which forums I want to see: - all my forums - only the forums of current institution/degree/course *****/ - Act_StartForm (ActSeeFor); + Frm_StartForm (ActSeeFor); For_PutParamForumOrder (Gbl.Forum.ThreadsOrder); fprintf (Gbl.F.Out,"
    " "
      "); @@ -1786,7 +1787,7 @@ static void For_PutFormWhichForums (void) } fprintf (Gbl.F.Out,"
    " "
    "); - Act_EndForm (); + Frm_EndForm (); } /*****************************************************************************/ @@ -2074,7 +2075,7 @@ static void For_WriteLinkToForum (struct Forum *Forum, Txt_Copy_not_allowed,Txt_Copy_not_allowed); else { - Act_StartFormAnchor (For_ActionsPasThrFor[Forum->Type], + Frm_StartFormAnchor (For_ActionsPasThrFor[Forum->Type], For_FORUM_THREADS_SECTION_ID); For_PutAllHiddenParamsForum (1, // Page of threads = first 1, // Page of posts = first @@ -2089,12 +2090,12 @@ static void For_WriteLinkToForum (struct Forum *Forum, Gbl.Prefs.IconsURL, Txt_Paste_thread, Txt_Paste_thread); - Act_EndForm (); + Frm_EndForm (); } } /***** Write link to forum *****/ - Act_StartFormAnchor (For_ActionsSeeFor[Forum->Type], + Frm_StartFormAnchor (For_ActionsSeeFor[Forum->Type], For_FORUM_THREADS_SECTION_ID); For_PutAllHiddenParamsForum (1, // Page of threads = first 1, // Page of posts = first @@ -2103,7 +2104,7 @@ static void For_WriteLinkToForum (struct Forum *Forum, Forum->Location, -1L, -1L); - Act_LinkFormSubmit (Act_GetActionTextFromDB (Act_GetActCod (For_ActionsSeeFor[Forum->Type]),ActTxt), + Frm_LinkFormSubmit (Act_GetActionTextFromDB (Act_GetActCod (For_ActionsSeeFor[Forum->Type]),ActTxt), Style,NULL); For_SetForumName (Forum,ForumName,Gbl.Prefs.Language,true); switch (Forum->Type) @@ -2158,7 +2159,7 @@ static void For_WriteLinkToForum (struct Forum *Forum, /***** End row *****/ fprintf (Gbl.F.Out,""); - Act_EndForm (); + Frm_EndForm (); /***** Put link to register students *****/ if (Forum->Type == For_FORUM_COURSE_USRS) @@ -2582,7 +2583,7 @@ static void For_ShowForumThreadsHighlightingOneThread (long ThrCodHighlighted, Order++) { fprintf (Gbl.F.Out,""); } fprintf (Gbl.F.Out,""); } @@ -356,10 +357,10 @@ static void Gam_PutButtonToCreateNewGame (void) { extern const char *Txt_New_game; - Act_StartForm (ActFrmNewGam); + Frm_StartForm (ActFrmNewGam); Gam_PutParamsToCreateNewGame (); Btn_PutConfirmButton (Txt_New_game); - Act_EndForm (); + Frm_EndForm (); } /*****************************************************************************/ @@ -511,17 +512,17 @@ static void Gam_ShowOneGame (long GamCod, fprintf (Gbl.F.Out,"\">"); /* Put form to view game */ - Act_StartForm (ActSeeOneGam); + Frm_StartForm (ActSeeOneGam); Gam_PutParamGameCod (GamCod); Gam_PutHiddenParamGameOrder (); Grp_PutParamWhichGrps (); Pag_PutHiddenParamPagNum (Pag_GAMES,Gbl.Games.CurrentPage); - Act_LinkFormSubmit (Txt_View_game, + Frm_LinkFormSubmit (Txt_View_game, Game.Status.Visible ? "ASG_TITLE" : "ASG_TITLE_LIGHT",NULL); fprintf (Gbl.F.Out,"%s", Game.Title); - Act_EndForm (); + Frm_EndForm (); /* Number of questions and number of distinct users who have already answered this game */ fprintf (Gbl.F.Out,"
    %s: %u; %s: %u
    " @@ -544,13 +545,13 @@ static void Gam_ShowOneGame (long GamCod, { fprintf (Gbl.F.Out,"
    "); - Act_StartForm (ActPlyGam); + Frm_StartForm (ActPlyGam); Gam_PutParamGameCod (Game.GamCod); Gam_PutHiddenParamGameOrder (); Grp_PutParamWhichGrps (); Pag_PutHiddenParamPagNum (Pag_GAMES,Gbl.Games.CurrentPage); Btn_PutCreateButtonInline (Txt_Play); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,"
    "); } @@ -561,13 +562,13 @@ static void Gam_ShowOneGame (long GamCod, { fprintf (Gbl.F.Out,"
    "); - Act_StartForm (ActSeeOneGam); + Frm_StartForm (ActSeeOneGam); Gam_PutParamGameCod (Game.GamCod); Gam_PutHiddenParamGameOrder (); Grp_PutParamWhichGrps (); Pag_PutHiddenParamPagNum (Pag_GAMES,Gbl.Games.CurrentPage); Btn_PutCreateButtonInline (Txt_Play); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,"
    "); } @@ -576,13 +577,13 @@ static void Gam_ShowOneGame (long GamCod, { fprintf (Gbl.F.Out,"
    "); - Act_StartForm (ActSeeOneGam); + Frm_StartForm (ActSeeOneGam); Gam_PutParamGameCod (Game.GamCod); Gam_PutHiddenParamGameOrder (); Grp_PutParamWhichGrps (); Pag_PutHiddenParamPagNum (Pag_GAMES,Gbl.Games.CurrentPage); Btn_PutConfirmButtonInline (Txt_View_game_results); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,"
    "); } @@ -1593,10 +1594,10 @@ static void Gam_PutButtonToResetGame (void) { extern const char *Txt_Reset_game; - Act_StartForm (ActRstGam); + Frm_StartForm (ActRstGam); Gam_PutParams (); Btn_PutRemoveButton (Txt_Reset_game); - Act_EndForm (); + Frm_EndForm (); } /*****************************************************************************/ @@ -1790,7 +1791,7 @@ void Gam_RequestCreatOrEditGame (void) /***** Start form *****/ Gbl.Games.CurrentGamCod = Game.GamCod; - Act_StartForm (ItsANewGame ? ActNewGam : + Frm_StartForm (ItsANewGame ? ActNewGam : ActChgGam); Gam_PutParams (); @@ -1878,7 +1879,7 @@ void Gam_RequestCreatOrEditGame (void) Box_EndBoxTableWithButton (Btn_CONFIRM_BUTTON,Txt_Save); /***** End form *****/ - Act_EndForm (); + Frm_EndForm (); /***** Show questions of the game ready to be edited *****/ if (!ItsANewGame) @@ -2778,7 +2779,7 @@ static void Gam_ListGameQuestions (struct Game *Game) Btn_PutConfirmButton (Txt_Done); /***** End form *****/ - Act_EndForm (); + Frm_EndForm (); } } else // This game has no questions @@ -2877,11 +2878,11 @@ static void Gam_ListOneOrMoreQuestionsForEdition (struct Game *Game, "" ""); /* Name of group type */ fprintf (Gbl.F.Out,""); /* Is it possible to register in multiple groups? */ fprintf (Gbl.F.Out,""); /* Open time */ fprintf (Gbl.F.Out,"" @@ -1400,7 +1401,7 @@ static void Grp_ListGroupTypesForEdition (void) fprintf (Gbl.F.Out,"" ""); Tbl_EndTable (); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,""); /* Number of groups of this type */ @@ -1519,15 +1520,15 @@ static void Grp_ListGroupsForEdition (void) /* Write icon to remove group */ fprintf (Gbl.F.Out,"" ""); /* Write icon to open/close group */ fprintf (Gbl.F.Out,""); /* Write icon to activate file zones for this group */ fprintf (Gbl.F.Out,""); /* Group type */ fprintf (Gbl.F.Out,""); /* Group name */ fprintf (Gbl.F.Out,""); /* Current number of users in this group */ @@ -1610,14 +1611,14 @@ static void Grp_ListGroupsForEdition (void) /* Maximum number of students of the group (row[3]) */ fprintf (Gbl.F.Out,"" ""); } @@ -1791,7 +1792,7 @@ void Grp_ShowLstGrpsToChgMyGrps (void) { /***** Start form *****/ if (PutFormToChangeGrps) - Act_StartForm (ActChgGrp); + Frm_StartForm (ActChgGrp); /***** List the groups the user belongs to for change *****/ Tbl_StartTableWide (2); @@ -1812,7 +1813,7 @@ void Grp_ShowLstGrpsToChgMyGrps (void) if (ICanChangeMyGrps) Btn_PutConfirmButton (NumGrpsIBelong ? Txt_Change_my_groups : Txt_Enrol_in_groups); - Act_EndForm (); + Frm_EndForm (); } } else // This course has no groups @@ -1825,9 +1826,9 @@ void Grp_ShowLstGrpsToChgMyGrps (void) /***** Button to create group *****/ if (ICanEdit) { - Act_StartForm (ActReqEdiGrp); + Frm_StartForm (ActReqEdiGrp); Btn_PutConfirmButton (Txt_Create_group); - Act_EndForm (); + Frm_EndForm (); } } @@ -2474,7 +2475,7 @@ static void Grp_PutFormToCreateGroupType (void) /***** Start form *****/ Lay_StartSection (Grp_NEW_GROUP_TYPE_SECTION_ID); - Act_StartFormAnchor (ActNewGrpTyp,Grp_GROUP_TYPES_SECTION_ID); + Frm_StartFormAnchor (ActNewGrpTyp,Grp_GROUP_TYPES_SECTION_ID); /***** Start box *****/ Box_StartBoxTable (NULL,Txt_New_type_of_group,NULL, @@ -2569,7 +2570,7 @@ static void Grp_PutFormToCreateGroupType (void) Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_type_of_group); /***** End form *****/ - Act_EndForm (); + Frm_EndForm (); Lay_EndSection (); } @@ -2588,7 +2589,7 @@ static void Grp_PutFormToCreateGroup (void) /***** Start form *****/ Lay_StartSection (Grp_NEW_GROUP_SECTION_ID); - Act_StartFormAnchor (ActNewGrp,Grp_GROUPS_SECTION_ID); + Frm_StartFormAnchor (ActNewGrp,Grp_GROUPS_SECTION_ID); /***** Start box and table *****/ Box_StartBoxTable (NULL,Txt_New_group,NULL, @@ -2663,7 +2664,7 @@ static void Grp_PutFormToCreateGroup (void) Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_group); /***** End form *****/ - Act_EndForm (); + Frm_EndForm (); Lay_EndSection (); } @@ -4884,7 +4885,7 @@ void Grp_ShowFormToSelWhichGrps (Act_Action_t Action,void (*FuncParams) ()) fprintf (Gbl.F.Out,"
    ", WhichGrps == Gbl.CurrentCrs.Grps.WhichGrps ? "PREF_ON" : "PREF_OFF"); - Act_StartForm (Action); + Frm_StartForm (Action); Par_PutHiddenParamUnsigned ("WhichGrps",(unsigned) WhichGrps); if (FuncParams) // Extra parameters depending on the action FuncParams (); @@ -4896,7 +4897,7 @@ void Grp_ShowFormToSelWhichGrps (Act_Action_t Action,void (*FuncParams) ()) "hierarchy64x64.png", Txt_GROUP_WHICH_GROUPS[WhichGrps], Txt_GROUP_WHICH_GROUPS[WhichGrps]); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,"
    "); } fprintf (Gbl.F.Out,""); diff --git a/swad_help.c b/swad_help.c index 59913f00..f3880f56 100644 --- a/swad_help.c +++ b/swad_help.c @@ -30,6 +30,7 @@ #include "swad_action.h" #include "swad_box.h" #include "swad_config.h" +#include "swad_form.h" #include "swad_global.h" #include "swad_help.h" #include "swad_user.h" @@ -281,9 +282,9 @@ static void Hlp_ShowRowHelpWhatWouldYouLikeToDo (const char *Description, /***** Button *****/ fprintf (Gbl.F.Out,"" ""); } diff --git a/swad_hierarchy.c b/swad_hierarchy.c index ce43f09e..c805b571 100644 --- a/swad_hierarchy.c +++ b/swad_hierarchy.c @@ -30,6 +30,7 @@ #include "swad_config.h" #include "swad_degree.h" +#include "swad_form.h" #include "swad_global.h" #include "swad_logo.h" #include "swad_table.h" @@ -193,11 +194,11 @@ void Hie_WriteHierarchyInBreadcrumb (void) /***** Form to go to the system *****/ fprintf (Gbl.F.Out,"
     ",ClassTxt); - Act_StartFormGoTo (ActMnu); + Frm_StartFormGoTo (ActMnu); Par_PutHiddenParamUnsigned ("NxtTab",(unsigned) TabSys); - Act_LinkFormSubmit (Txt_System,ClassTxt,NULL); + Frm_LinkFormSubmit (Txt_System,ClassTxt,NULL); fprintf (Gbl.F.Out,"%s",Txt_System); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,"
    "); @@ -209,11 +210,11 @@ void Hie_WriteHierarchyInBreadcrumb (void) fprintf (Gbl.F.Out," > "); /***** Form to go to see institutions of this country *****/ - Act_StartFormGoTo (ActSeeIns); + Frm_StartFormGoTo (ActSeeIns); Cty_PutParamCtyCod (Gbl.CurrentCty.Cty.CtyCod); - Act_LinkFormSubmit (Gbl.CurrentCty.Cty.Name[Gbl.Prefs.Language],ClassTxt,NULL); + Frm_LinkFormSubmit (Gbl.CurrentCty.Cty.Name[Gbl.Prefs.Language],ClassTxt,NULL); fprintf (Gbl.F.Out,"%s",Gbl.CurrentCty.Cty.Name[Gbl.Prefs.Language]); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,""); } @@ -225,10 +226,10 @@ void Hie_WriteHierarchyInBreadcrumb (void) fprintf (Gbl.F.Out," > "); /***** Form to go to select countries *****/ - Act_StartFormGoTo (ActSeeCty); - Act_LinkFormSubmit (Txt_Country,ClassTxt,NULL); + Frm_StartFormGoTo (ActSeeCty); + Frm_LinkFormSubmit (Txt_Country,ClassTxt,NULL); fprintf (Gbl.F.Out,"%s",Txt_Country); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,""); } @@ -241,11 +242,11 @@ void Hie_WriteHierarchyInBreadcrumb (void) fprintf (Gbl.F.Out," > "); /***** Form to see centres of this institution *****/ - Act_StartFormGoTo (ActSeeCtr); + Frm_StartFormGoTo (ActSeeCtr); Ins_PutParamInsCod (Gbl.CurrentIns.Ins.InsCod); - Act_LinkFormSubmit (Gbl.CurrentIns.Ins.FullName,ClassTxt,NULL); + Frm_LinkFormSubmit (Gbl.CurrentIns.Ins.FullName,ClassTxt,NULL); fprintf (Gbl.F.Out,"%s",Gbl.CurrentIns.Ins.ShrtName); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,""); } @@ -257,10 +258,10 @@ void Hie_WriteHierarchyInBreadcrumb (void) fprintf (Gbl.F.Out," > "); /***** Form to go to select institutions *****/ - Act_StartFormGoTo (ActSeeIns); - Act_LinkFormSubmit (Txt_Institution,ClassTxt,NULL); + Frm_StartFormGoTo (ActSeeIns); + Frm_LinkFormSubmit (Txt_Institution,ClassTxt,NULL); fprintf (Gbl.F.Out,"%s",Txt_Institution); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,""); } @@ -285,11 +286,11 @@ void Hie_WriteHierarchyInBreadcrumb (void) fprintf (Gbl.F.Out," > "); /***** Form to see degrees of this centre *****/ - Act_StartFormGoTo (ActSeeDeg); + Frm_StartFormGoTo (ActSeeDeg); Ctr_PutParamCtrCod (Gbl.CurrentCtr.Ctr.CtrCod); - Act_LinkFormSubmit (Gbl.CurrentCtr.Ctr.FullName,ClassTxt,NULL); + Frm_LinkFormSubmit (Gbl.CurrentCtr.Ctr.FullName,ClassTxt,NULL); fprintf (Gbl.F.Out,"%s",Gbl.CurrentCtr.Ctr.ShrtName); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,""); } @@ -301,10 +302,10 @@ void Hie_WriteHierarchyInBreadcrumb (void) fprintf (Gbl.F.Out," > "); /***** Form to go to select centres *****/ - Act_StartFormGoTo (ActSeeCtr); - Act_LinkFormSubmit (Txt_Centre,ClassTxt,NULL); + Frm_StartFormGoTo (ActSeeCtr); + Frm_LinkFormSubmit (Txt_Centre,ClassTxt,NULL); fprintf (Gbl.F.Out,"%s",Txt_Centre); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,""); } @@ -329,11 +330,11 @@ void Hie_WriteHierarchyInBreadcrumb (void) fprintf (Gbl.F.Out," > "); /***** Form to go to see courses of this degree *****/ - Act_StartFormGoTo (ActSeeCrs); + Frm_StartFormGoTo (ActSeeCrs); Deg_PutParamDegCod (Gbl.CurrentDeg.Deg.DegCod); - Act_LinkFormSubmit (Gbl.CurrentDeg.Deg.FullName,ClassTxt,NULL); + Frm_LinkFormSubmit (Gbl.CurrentDeg.Deg.FullName,ClassTxt,NULL); fprintf (Gbl.F.Out,"%s",Gbl.CurrentDeg.Deg.ShrtName); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,""); } @@ -345,10 +346,10 @@ void Hie_WriteHierarchyInBreadcrumb (void) fprintf (Gbl.F.Out," > "); /***** Form to go to select degrees *****/ - Act_StartFormGoTo (ActSeeDeg); - Act_LinkFormSubmit (Txt_Degree,ClassTxt,NULL); + Frm_StartFormGoTo (ActSeeDeg); + Frm_LinkFormSubmit (Txt_Degree,ClassTxt,NULL); fprintf (Gbl.F.Out,"%s",Txt_Degree); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,""); } diff --git a/swad_holiday.c b/swad_holiday.c index b89cf11a..c74fcbf4 100644 --- a/swad_holiday.c +++ b/swad_holiday.c @@ -33,6 +33,7 @@ #include "swad_box.h" #include "swad_database.h" +#include "swad_form.h" #include "swad_global.h" #include "swad_holiday.h" #include "swad_parameter.h" @@ -116,16 +117,16 @@ void Hld_SeeHolidays (void) Order++) { fprintf (Gbl.F.Out,""); } fprintf (Gbl.F.Out,"" ""); /* Holiday code */ @@ -548,7 +549,7 @@ static void Hld_ListHolidaysForEdition (void) /* Holiday place */ fprintf (Gbl.F.Out,""); /* Holiday type */ fprintf (Gbl.F.Out,""); /* Holiday date / Non school period start date */ fprintf (Gbl.F.Out,""); /* Non school period end date */ fprintf (Gbl.F.Out,""); /* Holiday name */ fprintf (Gbl.F.Out,"" ""); } @@ -977,7 +978,7 @@ static void Hld_PutFormToCreateHoliday (void) Hld = &Gbl.Hlds.EditingHld; /***** Start form *****/ - Act_StartForm (ActNewHld); + Frm_StartForm (ActNewHld); /***** Start box and table *****/ Box_StartBoxTable (NULL,Txt_New_holiday,NULL, @@ -1072,7 +1073,7 @@ static void Hld_PutFormToCreateHoliday (void) Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_holiday); /***** End form *****/ - Act_EndForm (); + Frm_EndForm (); } /*****************************************************************************/ diff --git a/swad_icon.c b/swad_icon.c index e22c30db..d4641077 100644 --- a/swad_icon.c +++ b/swad_icon.c @@ -32,6 +32,7 @@ #include "swad_box.h" #include "swad_config.h" #include "swad_database.h" +#include "swad_form.h" #include "swad_global.h" #include "swad_icon.h" #include "swad_layout.h" @@ -88,7 +89,7 @@ void Ico_PutIconsToSelectIconSet (void) fprintf (Gbl.F.Out,"
    ", IconSet == Gbl.Prefs.IconSet ? "PREF_ON" : "PREF_OFF"); - Act_StartForm (ActChgIco); + Frm_StartForm (ActChgIco); Par_PutHiddenParamString ("IconSet",Ico_IconSetId[IconSet]); fprintf (Gbl.F.Out,"", @@ -98,7 +99,7 @@ void Ico_PutIconsToSelectIconSet (void) Cfg_ICON_ACTION, Ico_IconSetNames[IconSet], Ico_IconSetNames[IconSet]); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,"
    "); } fprintf (Gbl.F.Out,""); @@ -258,7 +259,7 @@ void Ico_PutContextualIconToPrint (Act_Action_t NextAction,void (*FuncParams) () void Ico_PutIconLink (const char *Icon,const char *Title,const char *Text, const char *LinkStyle,const char *OnSubmit) { - Act_LinkFormSubmit (Title,LinkStyle,OnSubmit); + Frm_LinkFormSubmit (Title,LinkStyle,OnSubmit); if (Text) Ico_PutIconWithText (Icon,Title,Text); else diff --git a/swad_image.c b/swad_image.c index e0a6b712..d089c574 100644 --- a/swad_image.c +++ b/swad_image.c @@ -36,6 +36,7 @@ #include "swad_global.h" #include "swad_file.h" #include "swad_file_browser.h" +#include "swad_form.h" #include "swad_image.h" /*****************************************************************************/ @@ -197,13 +198,13 @@ void Img_PutImageUploader (int NumImgInForm,const char *ClassImgTitURL) extern const char *Txt_Image_title_attribution; extern const char *Txt_Link; struct ParamUploadImg ParamUploadImg; - char Id[Act_MAX_BYTES_ID + 1]; + char Id[Frm_MAX_BYTES_ID + 1]; /***** Set names of parameters depending on number of image in form *****/ Img_SetParamNames (&ParamUploadImg,NumImgInForm); /***** Create unique id for this image uploader *****/ - Act_SetUniqueId (Id); + Frm_SetUniqueId (Id); /***** Start container *****/ fprintf (Gbl.F.Out,"
    "); diff --git a/swad_indicator.c b/swad_indicator.c index 85ede367..29cb7b69 100644 --- a/swad_indicator.c +++ b/swad_indicator.c @@ -33,6 +33,8 @@ #include "swad_action.h" #include "swad_box.h" #include "swad_database.h" +#include "swad_form.h" +#include "swad_forum.h" #include "swad_global.h" #include "swad_indicator.h" #include "swad_parameter.h" @@ -114,7 +116,7 @@ void Ind_ReqIndicatorsCourses (void) /***** Form to update indicators *****/ /* Start form and table */ - Act_StartForm (ActReqStaCrs); + Frm_StartForm (ActReqStaCrs); Tbl_StartTableWide (2); /* Scope */ @@ -184,7 +186,7 @@ void Ind_ReqIndicatorsCourses (void) /* End table and form */ Tbl_EndTable (); - Act_EndForm (); + Frm_EndForm (); /***** Show the stats of courses *****/ for (Ind = 0, NumCrssToList = 0; @@ -198,14 +200,14 @@ void Ind_ReqIndicatorsCourses (void) Ind_ShowTableOfCoursesWithIndicators (Ind_INDICATORS_BRIEF,NumCrss,mysql_res); /* Button to show more details */ - Act_StartForm (ActSeeAllStaCrs); + 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); if (Gbl.Stat.StrIndicatorsSelected[0]) Par_PutHiddenParamString ("Indicators",Gbl.Stat.StrIndicatorsSelected); Btn_PutConfirmButton (Txt_Show_more_details); - Act_EndForm (); + Frm_EndForm (); } /***** End box *****/ diff --git a/swad_info.c b/swad_info.c index f5072e59..726db203 100644 --- a/swad_info.c +++ b/swad_info.c @@ -38,6 +38,7 @@ #include "swad_action.h" #include "swad_box.h" #include "swad_database.h" +#include "swad_form.h" #include "swad_global.h" #include "swad_info.h" #include "swad_parameter.h" @@ -464,9 +465,9 @@ static void Inf_PutButtonToEditInfo (void) { extern const char *Txt_Edit; - Act_StartForm (Inf_ActionsEditInfo[Gbl.CurrentCrs.Info.Type]); + Frm_StartForm (Inf_ActionsEditInfo[Gbl.CurrentCrs.Info.Type]); Btn_PutConfirmButton (Txt_Edit); - Act_EndForm (); + Frm_EndForm (); } /*****************************************************************************/ @@ -608,13 +609,13 @@ void Inf_WriteMsgYouMustReadInfo (void) if (Gbl.CurrentCrs.Info.MustBeRead[InfoType]) { fprintf (Gbl.F.Out,"
  • "); - Act_StartForm (Inf_ActionsSeeInfo[InfoType]); - Act_LinkFormSubmit (Act_GetTitleAction (Inf_ActionsSeeInfo[InfoType]), + Frm_StartForm (Inf_ActionsSeeInfo[InfoType]); + Frm_LinkFormSubmit (Act_GetTitleAction (Inf_ActionsSeeInfo[InfoType]), The_ClassForm[Gbl.Prefs.Theme],NULL); fprintf (Gbl.F.Out,"%s" "", Act_GetTitleAction (Inf_ActionsSeeInfo[InfoType])); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,"
    • "); } fprintf (Gbl.F.Out,"" @@ -1141,7 +1142,7 @@ void Inf_FormsToSelSendInfo (void) if (InfoSrc == InfoSrcSelected) fprintf (Gbl.F.Out," LIGHT_BLUE"); fprintf (Gbl.F.Out,"\">"); - Act_StartForm (Inf_ActionsSelecInfoSrc[Gbl.CurrentCrs.Info.Type]); + Frm_StartForm (Inf_ActionsSelecInfoSrc[Gbl.CurrentCrs.Info.Type]); fprintf (Gbl.F.Out,""); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,""); /* Form for this info source */ @@ -1226,9 +1227,9 @@ void Inf_FormToEnterIntegratedEditor (Inf_InfoSrc_t InfoSrc) { extern const char *Txt_Edit; - Act_StartForm (Inf_ActionsInfo[InfoSrc][Gbl.CurrentCrs.Info.Type]); + Frm_StartForm (Inf_ActionsInfo[InfoSrc][Gbl.CurrentCrs.Info.Type]); Btn_PutConfirmButton (Txt_Edit); - Act_EndForm (); + Frm_EndForm (); } /*****************************************************************************/ @@ -1239,9 +1240,9 @@ void Inf_FormToEnterPlainTextEditor (Inf_InfoSrc_t InfoSrc) { extern const char *Txt_Edit_plain_text; - Act_StartForm (Inf_ActionsInfo[InfoSrc][Gbl.CurrentCrs.Info.Type]); + Frm_StartForm (Inf_ActionsInfo[InfoSrc][Gbl.CurrentCrs.Info.Type]); Btn_PutConfirmButton (Txt_Edit_plain_text); - Act_EndForm (); + Frm_EndForm (); } /*****************************************************************************/ @@ -1252,9 +1253,9 @@ void Inf_FormToEnterRichTextEditor (Inf_InfoSrc_t InfoSrc) { extern const char *Txt_Edit_rich_text; - Act_StartForm (Inf_ActionsInfo[InfoSrc][Gbl.CurrentCrs.Info.Type]); + Frm_StartForm (Inf_ActionsInfo[InfoSrc][Gbl.CurrentCrs.Info.Type]); Btn_PutConfirmButton (Txt_Edit_rich_text); - Act_EndForm (); + Frm_EndForm (); } /*****************************************************************************/ @@ -1268,7 +1269,7 @@ void Inf_FormToSendPage (Inf_InfoSrc_t InfoSrc) extern const char *Txt_Upload_file; /***** Start form *****/ - Act_StartForm (Inf_ActionsInfo[InfoSrc][Gbl.CurrentCrs.Info.Type]); + Frm_StartForm (Inf_ActionsInfo[InfoSrc][Gbl.CurrentCrs.Info.Type]); /***** File *****/ fprintf (Gbl.F.Out,"
    " @@ -1284,7 +1285,7 @@ void Inf_FormToSendPage (Inf_InfoSrc_t InfoSrc) Btn_PutCreateButton (Txt_Upload_file); /***** End form *****/ - Act_EndForm (); + Frm_EndForm (); } /*****************************************************************************/ @@ -1303,7 +1304,7 @@ void Inf_FormToSendURL (Inf_InfoSrc_t InfoSrc) Inf_BuildPathURL (Gbl.CurrentCrs.Crs.CrsCod,Gbl.CurrentCrs.Info.Type,PathFile); /***** Start form *****/ - Act_StartForm (Inf_ActionsInfo[InfoSrc][Gbl.CurrentCrs.Info.Type]); + Frm_StartForm (Inf_ActionsInfo[InfoSrc][Gbl.CurrentCrs.Info.Type]); /***** Link *****/ fprintf (Gbl.F.Out,"
    " @@ -1330,7 +1331,7 @@ void Inf_FormToSendURL (Inf_InfoSrc_t InfoSrc) Btn_PutCreateButton (Txt_Send_URL); /***** End form *****/ - Act_EndForm (); + Frm_EndForm (); } /*****************************************************************************/ @@ -2064,7 +2065,7 @@ void Inf_EditPlainTxtInfo (void) Gbl.CurrentCrs.Info.Type = Inf_AsignInfoType (); /***** Start form and box *****/ - Act_StartForm (Inf_ActionsRcvPlaTxtInfo[Gbl.CurrentCrs.Info.Type]); + Frm_StartForm (Inf_ActionsRcvPlaTxtInfo[Gbl.CurrentCrs.Info.Type]); Box_StartBox (NULL,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type],NULL, HelpEdit[Gbl.CurrentCrs.Info.Type],Box_NOT_CLOSABLE); @@ -2087,7 +2088,7 @@ void Inf_EditPlainTxtInfo (void) /***** Send button and end box *****/ Box_EndBoxWithButton (Btn_CONFIRM_BUTTON,Txt_Save); - Act_EndForm (); + Frm_EndForm (); } /*****************************************************************************/ @@ -2115,7 +2116,7 @@ void Inf_EditRichTxtInfo (void) Gbl.CurrentCrs.Info.Type = Inf_AsignInfoType (); /***** Start form and box *****/ - Act_StartForm (Inf_ActionsRcvRchTxtInfo[Gbl.CurrentCrs.Info.Type]); + Frm_StartForm (Inf_ActionsRcvRchTxtInfo[Gbl.CurrentCrs.Info.Type]); Box_StartBox (NULL,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type],NULL, HelpEdit[Gbl.CurrentCrs.Info.Type],Box_NOT_CLOSABLE); @@ -2138,7 +2139,7 @@ void Inf_EditRichTxtInfo (void) /***** Send button and end box *****/ Box_EndBoxWithButton (Btn_CONFIRM_BUTTON,Txt_Save); - Act_EndForm (); + Frm_EndForm (); } /*****************************************************************************/ diff --git a/swad_institution.c b/swad_institution.c index e9598163..d38e8bbb 100644 --- a/swad_institution.c +++ b/swad_institution.c @@ -35,6 +35,7 @@ #include "swad_config.h" #include "swad_constant.h" #include "swad_database.h" +#include "swad_form.h" #include "swad_global.h" #include "swad_help.h" #include "swad_hierarchy.h" @@ -229,16 +230,16 @@ void Ins_DrawInstitutionLogoWithLink (struct Instit *Ins,unsigned Size) if (PutLink) { - Act_StartForm (ActSeeInsInf); + Frm_StartForm (ActSeeInsInf); Ins_PutParamInsCod (Ins->InsCod); - Act_LinkFormSubmit (Ins->FullName,NULL,NULL); + Frm_LinkFormSubmit (Ins->FullName,NULL,NULL); } Log_DrawLogo (Sco_SCOPE_INS,Ins->InsCod,Ins->FullName, Size,NULL,true); if (PutLink) { fprintf (Gbl.F.Out,""); - Act_EndForm (); + Frm_EndForm (); } } @@ -252,14 +253,14 @@ void Ins_DrawInstitutionLogoAndNameWithLink (struct Instit *Ins,Act_Action_t Act extern const char *Txt_Go_to_X; /***** Start form *****/ - Act_StartFormGoTo (Action); + Frm_StartFormGoTo (Action); Ins_PutParamInsCod (Ins->InsCod); /***** Link to action *****/ snprintf (Gbl.Title,sizeof (Gbl.Title), Txt_Go_to_X, Ins->FullName); - Act_LinkFormSubmit (Gbl.Title,ClassLink,NULL); + Frm_LinkFormSubmit (Gbl.Title,ClassLink,NULL); /***** Draw institution logo *****/ Log_DrawLogo (Sco_SCOPE_INS,Ins->InsCod,Ins->ShrtName,20,ClassLogo,true); @@ -268,7 +269,7 @@ void Ins_DrawInstitutionLogoAndNameWithLink (struct Instit *Ins,Act_Action_t Act fprintf (Gbl.F.Out," %s",Ins->FullName); /***** End form *****/ - Act_EndForm (); + Frm_EndForm (); } /*****************************************************************************/ @@ -360,7 +361,7 @@ static void Ins_Configuration (bool PrintView) Cty_GetListCountries (Cty_GET_BASIC_DATA); /* Put form to select country */ - Act_StartForm (ActChgInsCtyCfg); + Frm_StartForm (ActChgInsCtyCfg); fprintf (Gbl.F.Out,""); - Act_EndForm (); + Frm_EndForm (); /* Free list of countries */ Cty_FreeListCountries (); @@ -398,7 +399,7 @@ static void Ins_Configuration (bool PrintView) // Only system admins can edit institution full name { /* Form to change institution full name */ - Act_StartForm (ActRenInsFulCfg); + Frm_StartForm (ActRenInsFulCfg); fprintf (Gbl.F.Out,"" @@ -537,15 +538,15 @@ static void Ins_Configuration (bool PrintView) Txt_Centres); /* Form to go to see centres of this institution */ - Act_StartFormGoTo (ActSeeCtr); + Frm_StartFormGoTo (ActSeeCtr); Ins_PutParamInsCod (Gbl.CurrentIns.Ins.InsCod); snprintf (Gbl.Title,sizeof (Gbl.Title), Txt_Centres_of_INSTITUTION_X, Gbl.CurrentIns.Ins.ShrtName); - Act_LinkFormSubmit (Gbl.Title,"DAT",NULL); + Frm_LinkFormSubmit (Gbl.Title,"DAT",NULL); fprintf (Gbl.F.Out,"%u", Ctr_GetNumCtrsInIns (Gbl.CurrentIns.Ins.InsCod)); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,"" ""); @@ -708,10 +709,10 @@ static void Ins_ListInstitutions (void) /***** Button to create institution *****/ if (Ins_CheckIfICanCreateInstitutions ()) { - Act_StartForm (ActEdiIns); + Frm_StartForm (ActEdiIns); Btn_PutConfirmButton (Gbl.Inss.Num ? Txt_Create_another_institution : Txt_Create_institution); - Act_EndForm (); + Frm_EndForm (); } Box_EndBox (); @@ -864,9 +865,9 @@ static void Ins_PutHeadInstitutionsForSeeing (bool OrderSelectable) "RIGHT_MIDDLE"); if (OrderSelectable) { - Act_StartForm (ActSeeIns); + Frm_StartForm (ActSeeIns); Par_PutHiddenParamUnsigned ("Order",(unsigned) Order); - Act_LinkFormSubmit (Txt_INSTITUTIONS_HELP_ORDER[Order],"TIT_TBL",NULL); + Frm_LinkFormSubmit (Txt_INSTITUTIONS_HELP_ORDER[Order],"TIT_TBL",NULL); if (Order == Gbl.Inss.SelectedOrder) fprintf (Gbl.F.Out,""); } @@ -876,7 +877,7 @@ static void Ins_PutHeadInstitutionsForSeeing (bool OrderSelectable) if (Order == Gbl.Inss.SelectedOrder) fprintf (Gbl.F.Out,""); fprintf (Gbl.F.Out,""); - Act_EndForm (); + Frm_EndForm (); } fprintf (Gbl.F.Out,""); } @@ -1358,7 +1359,7 @@ void Ins_WriteSelectorOfInstitution (void) long InsCod; /***** Start form *****/ - Act_StartFormGoTo (ActSeeCtr); + Frm_StartFormGoTo (ActSeeCtr); fprintf (Gbl.F.Out,""); - Act_EndForm (); + Frm_EndForm (); } /*****************************************************************************/ @@ -1450,10 +1451,10 @@ static void Ins_ListInstitutionsForEdition (void) Ico_PutIconRemovalNotAllowed (); else { - Act_StartForm (ActRemIns); + Frm_StartForm (ActRemIns); Ins_PutParamOtherInsCod (Ins->InsCod); Ico_PutIconRemove (); - Act_EndForm (); + Frm_EndForm (); } fprintf (Gbl.F.Out,""); @@ -1474,7 +1475,7 @@ static void Ins_ListInstitutionsForEdition (void) fprintf (Gbl.F.Out,"
    "); } else @@ -1568,7 +1569,7 @@ static void Ins_ListInstitutionsForEdition (void) if (Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM && StatusTxt == Ins_STATUS_PENDING) { - Act_StartForm (ActChgInsSta); + Frm_StartForm (ActChgInsSta); Ins_PutParamOtherInsCod (Ins->InsCod); fprintf (Gbl.F.Out,"", @@ -114,7 +115,7 @@ void Lan_PutSelectorToSelectLanguage (void) fprintf (Gbl.F.Out,">%s",Txt_STR_LANG_NAME[Lan]); } fprintf (Gbl.F.Out,""); - Act_EndForm (); + Frm_EndForm (); } /*****************************************************************************/ diff --git a/swad_layout.c b/swad_layout.c index a0ae2417..4b393696 100644 --- a/swad_layout.c +++ b/swad_layout.c @@ -38,6 +38,7 @@ #include "swad_database.h" #include "swad_exam.h" #include "swad_follow.h" +#include "swad_form.h" #include "swad_global.h" #include "swad_help.h" #include "swad_hierarchy.h" @@ -862,11 +863,11 @@ static void Lay_WritePageTopHeading (void) fprintf (Gbl.F.Out,"
    "); /* Start form to go to home page */ - Act_StartFormGoTo (ActMnu); + Frm_StartFormGoTo (ActMnu); Par_PutHiddenParamUnsigned ("NxtTab",(unsigned) TabSys); fprintf (Gbl.F.Out,"
    "); - Act_LinkFormSubmit (Txt_System,NULL,NULL); + Frm_LinkFormSubmit (Txt_System,NULL,NULL); fprintf (Gbl.F.Out,"\"%s\"" @@ -876,7 +877,7 @@ static void Lay_WritePageTopHeading (void) Cfg_PLATFORM_LOGO_SMALL_WIDTH,Cfg_PLATFORM_LOGO_SMALL_HEIGHT); fprintf (Gbl.F.Out,"
    " "
    "); - Act_LinkFormSubmit (Txt_System,NULL,NULL); + Frm_LinkFormSubmit (Txt_System,NULL,NULL); fprintf (Gbl.F.Out,"\"%s\"" @@ -886,14 +887,14 @@ static void Lay_WritePageTopHeading (void) Cfg_PLATFORM_LOGO_BIG_WIDTH,Cfg_PLATFORM_LOGO_BIG_HEIGHT); fprintf (Gbl.F.Out,"
    " "
    "); - Act_LinkFormSubmit (Txt_TAGLINE,The_ClassTagline[Gbl.Prefs.Theme],NULL); + Frm_LinkFormSubmit (Txt_TAGLINE,The_ClassTagline[Gbl.Prefs.Theme],NULL); fprintf (Gbl.F.Out,"%s" "" "
    ", // head_row_1_tagline Txt_TAGLINE_BR); /* End form to go to home page */ - Act_EndForm (); + Frm_EndForm (); Sch_PutFormToSearchInPageTopHeading (); @@ -1102,7 +1103,7 @@ void Lay_PutContextualLink (Act_Action_t NextAction,const char *Anchor, // jumping to the next line on narrow screens /***** Start form *****/ - Act_StartFormAnchor (NextAction,Anchor); + Frm_StartFormAnchor (NextAction,Anchor); if (FuncParams) FuncParams (); @@ -1113,7 +1114,7 @@ void Lay_PutContextualLink (Act_Action_t NextAction,const char *Anchor, OnSubmit); /***** End form *****/ - Act_EndForm (); + Frm_EndForm (); /***** Separator *****/ if (Text) @@ -1139,7 +1140,7 @@ void Lay_PutContextualCheckbox (Act_Action_t NextAction, // jumping to the next line on narrow screens /***** Start form *****/ - Act_StartForm (NextAction); + Frm_StartForm (NextAction); if (FuncParams) FuncParams (); @@ -1172,7 +1173,7 @@ void Lay_PutContextualCheckbox (Act_Action_t NextAction, "
    "); /***** End form *****/ - Act_EndForm (); + Frm_EndForm (); /***** Separator *****/ if (Text) diff --git a/swad_link.c b/swad_link.c index bd3280f1..6aa388c5 100644 --- a/swad_link.c +++ b/swad_link.c @@ -34,6 +34,7 @@ #include "swad_box.h" #include "swad_constant.h" #include "swad_database.h" +#include "swad_form.h" #include "swad_global.h" #include "swad_link.h" #include "swad_parameter.h" @@ -128,9 +129,9 @@ void Lnk_SeeLinks (void) /***** Button to create link *****/ if (Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM) { - Act_StartForm (ActEdiLnk); + Frm_StartForm (ActEdiLnk); Btn_PutConfirmButton (Txt_New_link); - Act_EndForm (); + Frm_EndForm (); } /***** End box *****/ @@ -165,12 +166,12 @@ void Lnk_WriteMenuWithInstitutionalLinks (void) { fprintf (Gbl.F.Out,"
    "); - Act_StartForm (ActSeeLnk); - Act_LinkFormSubmit (Txt_Links,NULL,NULL); + Frm_StartForm (ActSeeLnk); + Frm_LinkFormSubmit (Txt_Links,NULL,NULL); fprintf (Gbl.F.Out," %s" "", Txt_Links); - Act_EndForm (); + Frm_EndForm (); Lnk_WriteListOfLinks (); fprintf (Gbl.F.Out,"
    "); @@ -405,10 +406,10 @@ static void Lnk_ListLinksForEdition (void) /* Put icon to remove link */ fprintf (Gbl.F.Out,"" ""); /* Link code */ @@ -419,7 +420,7 @@ static void Lnk_ListLinksForEdition (void) /* Link short name */ fprintf (Gbl.F.Out,""); /* Link full name */ fprintf (Gbl.F.Out,""); /* Link WWW */ fprintf (Gbl.F.Out,"" ""); } @@ -707,7 +708,7 @@ static void Lnk_PutFormToCreateLink (void) Lnk = &Gbl.Links.EditingLnk; /***** Start form *****/ - Act_StartForm (ActNewLnk); + Frm_StartForm (ActNewLnk); /***** Start box and table *****/ Box_StartBoxTable (NULL,Txt_New_link,NULL, @@ -753,7 +754,7 @@ static void Lnk_PutFormToCreateLink (void) Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_link); /***** End form *****/ - Act_EndForm (); + Frm_EndForm (); } /*****************************************************************************/ diff --git a/swad_logo.c b/swad_logo.c index 398fe126..2495f670 100644 --- a/swad_logo.c +++ b/swad_logo.c @@ -29,6 +29,7 @@ #include "swad_action.h" #include "swad_box.h" +#include "swad_form.h" #include "swad_global.h" #include "swad_scope.h" #include "swad_theme.h" @@ -286,7 +287,7 @@ void Log_RequestLogo (Sco_Scope_t Scope) } /***** Start form to upload logo *****/ - Act_StartForm (ActionRec); + Frm_StartForm (ActionRec); /***** Start box *****/ Box_StartBox (NULL,Txt_Logo,NULL, @@ -313,7 +314,7 @@ void Log_RequestLogo (Sco_Scope_t Scope) Box_EndBox (); /***** End form *****/ - Act_EndForm (); + Frm_EndForm (); } /*****************************************************************************/ diff --git a/swad_mail.c b/swad_mail.c index c99cda15..6d4c876e 100644 --- a/swad_mail.c +++ b/swad_mail.c @@ -36,6 +36,7 @@ #include "swad_account.h" #include "swad_box.h" #include "swad_database.h" +#include "swad_form.h" #include "swad_global.h" #include "swad_mail.h" #include "swad_parameter.h" @@ -128,16 +129,16 @@ void Mai_SeeMailDomains (void) Order++) { fprintf (Gbl.F.Out,""); } fprintf (Gbl.F.Out,""); @@ -476,10 +477,10 @@ static void Mai_ListMailDomainsForEdition (void) /* Put icon to remove mail */ fprintf (Gbl.F.Out,"" ""); /* Mail code */ @@ -490,26 +491,26 @@ static void Mai_ListMailDomainsForEdition (void) /* Mail domain */ fprintf (Gbl.F.Out,""); /* Mail domain info */ fprintf (Gbl.F.Out,""); /* Number of users */ @@ -730,7 +731,7 @@ static void Mai_PutFormToCreateMailDomain (void) Mai = &Gbl.Mails.EditingMai; /***** Start form *****/ - Act_StartForm (ActNewMai); + Frm_StartForm (ActNewMai); /***** Start box and table *****/ Box_StartBoxTable (NULL,Txt_New_email_domain,NULL, @@ -772,7 +773,7 @@ static void Mai_PutFormToCreateMailDomain (void) Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_email_domain); /***** End form *****/ - Act_EndForm (); + Frm_EndForm (); } /*****************************************************************************/ @@ -1297,7 +1298,7 @@ static void Mai_ShowFormChangeUsrEmail (const struct UsrData *UsrDat,bool ItsMe, /* Form to remove email */ if (ItsMe) - Act_StartFormAnchor (ActRemMaiMe,Mai_EMAIL_SECTION_ID); + Frm_StartFormAnchor (ActRemMaiMe,Mai_EMAIL_SECTION_ID); else { switch (UsrDat->Roles.InCurrentCrs.Role) @@ -1313,14 +1314,14 @@ static void Mai_ShowFormChangeUsrEmail (const struct UsrData *UsrDat,bool ItsMe, NextAction = ActRemMaiOth; break; } - Act_StartFormAnchor (NextAction,Mai_EMAIL_SECTION_ID); + Frm_StartFormAnchor (NextAction,Mai_EMAIL_SECTION_ID); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); } fprintf (Gbl.F.Out,"", row[0]); Ico_PutIconRemove (); - Act_EndForm (); + Frm_EndForm (); /* Email */ fprintf (Gbl.F.Out,"%s",row[0]); @@ -1343,7 +1344,7 @@ static void Mai_ShowFormChangeUsrEmail (const struct UsrData *UsrDat,bool ItsMe, { fprintf (Gbl.F.Out,"
    "); if (ItsMe) - Act_StartFormAnchor (ActNewMaiMe,Mai_EMAIL_SECTION_ID); + Frm_StartFormAnchor (ActNewMaiMe,Mai_EMAIL_SECTION_ID); else { switch (UsrDat->Roles.InCurrentCrs.Role) @@ -1359,14 +1360,14 @@ static void Mai_ShowFormChangeUsrEmail (const struct UsrData *UsrDat,bool ItsMe, NextAction = ActNewMaiOth; break; } - Act_StartFormAnchor (NextAction,Mai_EMAIL_SECTION_ID); + Frm_StartFormAnchor (NextAction,Mai_EMAIL_SECTION_ID); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); } fprintf (Gbl.F.Out,"", row[0]); // Email Btn_PutConfirmButtonInline ((ItsMe && NumEmail == 1) ? Txt_Confirm_email : Txt_Use_this_email); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,""); } @@ -1384,7 +1385,7 @@ static void Mai_ShowFormChangeUsrEmail (const struct UsrData *UsrDat,bool ItsMe, NumEmails ? Txt_New_email : // A new email Txt_Email); // The first email if (ItsMe) - Act_StartFormAnchor (ActNewMaiMe,Mai_EMAIL_SECTION_ID); + Frm_StartFormAnchor (ActNewMaiMe,Mai_EMAIL_SECTION_ID); else { switch (UsrDat->Roles.InCurrentCrs.Role) @@ -1400,7 +1401,7 @@ static void Mai_ShowFormChangeUsrEmail (const struct UsrData *UsrDat,bool ItsMe, NextAction = ActNewMaiOth; break; } - Act_StartFormAnchor (NextAction,Mai_EMAIL_SECTION_ID); + Frm_StartFormAnchor (NextAction,Mai_EMAIL_SECTION_ID); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); } fprintf (Gbl.F.Out,"" ""); diff --git a/swad_mark.c b/swad_mark.c index 15be99ae..405864de 100644 --- a/swad_mark.c +++ b/swad_mark.c @@ -34,6 +34,7 @@ #include // For unlink #include "swad_database.h" +#include "swad_form.h" #include "swad_global.h" #include "swad_ID.h" #include "swad_mark.h" @@ -129,11 +130,11 @@ void Mrk_GetAndWriteNumRowsHeaderAndFooter (Brw_FileType_t FileType, Gbl.RowEvenOdd); if (Gbl.CurrentCrs.Grps.GrpCod > 0) // Group zone { - Act_StartForm (ActChgNumRowHeaGrp); + Frm_StartForm (ActChgNumRowHeaGrp); Grp_PutParamGrpCod (Gbl.CurrentCrs.Grps.GrpCod); } else // Course zone - Act_StartForm (ActChgNumRowHeaCrs); + Frm_StartForm (ActChgNumRowHeaCrs); fprintf (Gbl.F.Out,"" "" ""); } @@ -3667,7 +3668,7 @@ static void Msg_PutFormToBanSender (struct UsrData *UsrDat) { extern const char *Txt_Sender_permitted_click_to_ban_him; - Act_StartForm (ActBanUsrMsg); + Frm_StartForm (ActBanUsrMsg); Pag_PutHiddenParamPagNum (Msg_WhatPaginate[Gbl.Msg.TypeOfMessages], Gbl.Msg.CurrentPage); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); @@ -3678,7 +3679,7 @@ static void Msg_PutFormToBanSender (struct UsrData *UsrDat) Gbl.Prefs.IconsURL, Txt_Sender_permitted_click_to_ban_him, Txt_Sender_permitted_click_to_ban_him); - Act_EndForm (); + Frm_EndForm (); } /*****************************************************************************/ @@ -3689,7 +3690,7 @@ static void Msg_PutFormToUnbanSender (struct UsrData *UsrDat) { extern const char *Txt_Sender_banned_click_to_unban_him; - Act_StartForm (ActUnbUsrMsg); + Frm_StartForm (ActUnbUsrMsg); Pag_PutHiddenParamPagNum (Msg_WhatPaginate[Gbl.Msg.TypeOfMessages], Gbl.Msg.CurrentPage); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); @@ -3700,7 +3701,7 @@ static void Msg_PutFormToUnbanSender (struct UsrData *UsrDat) Gbl.Prefs.IconsURL, Txt_Sender_banned_click_to_unban_him, Txt_Sender_banned_click_to_unban_him); - Act_EndForm (); + Frm_EndForm (); } /*****************************************************************************/ @@ -3871,7 +3872,7 @@ void Msg_ListBannedUsrs (void) /* Put form to unban user */ fprintf (Gbl.F.Out,"" ""); } diff --git a/swad_nickname.c b/swad_nickname.c index d8d78860..16f53f09 100644 --- a/swad_nickname.c +++ b/swad_nickname.c @@ -32,6 +32,7 @@ #include "swad_account.h" #include "swad_box.h" #include "swad_database.h" +#include "swad_form.h" #include "swad_global.h" #include "swad_parameter.h" #include "swad_QR.h" @@ -299,7 +300,7 @@ static void Nck_ShowFormChangeUsrNickname (const struct UsrData *UsrDat,bool Its /* Form to remove old nickname */ if (ItsMe) - Act_StartFormAnchor (ActRemOldNicMe,Nck_NICKNAME_SECTION_ID); + Frm_StartFormAnchor (ActRemOldNicMe,Nck_NICKNAME_SECTION_ID); else { switch (UsrDat->Roles.InCurrentCrs.Role) @@ -315,14 +316,14 @@ static void Nck_ShowFormChangeUsrNickname (const struct UsrData *UsrDat,bool Its NextAction = ActRemOldNicOth; break; } - Act_StartFormAnchor (NextAction,Nck_NICKNAME_SECTION_ID); + Frm_StartFormAnchor (NextAction,Nck_NICKNAME_SECTION_ID); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); } fprintf (Gbl.F.Out,"", row[0]); Ico_PutIconRemove (); - Act_EndForm (); + Frm_EndForm (); } /* Nickname */ @@ -337,7 +338,7 @@ static void Nck_ShowFormChangeUsrNickname (const struct UsrData *UsrDat,bool Its { fprintf (Gbl.F.Out,"
    "); if (ItsMe) - Act_StartFormAnchor (ActChgNicMe,Nck_NICKNAME_SECTION_ID); + Frm_StartFormAnchor (ActChgNicMe,Nck_NICKNAME_SECTION_ID); else { switch (UsrDat->Roles.InCurrentCrs.Role) @@ -353,14 +354,14 @@ static void Nck_ShowFormChangeUsrNickname (const struct UsrData *UsrDat,bool Its NextAction = ActChgNicOth; break; } - Act_StartFormAnchor (NextAction,Nck_NICKNAME_SECTION_ID); + Frm_StartFormAnchor (NextAction,Nck_NICKNAME_SECTION_ID); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); } fprintf (Gbl.F.Out,"", row[0]); // Nickname Btn_PutConfirmButtonInline (Txt_Use_this_nickname); - Act_EndForm (); + Frm_EndForm (); } fprintf (Gbl.F.Out,"" @@ -379,7 +380,7 @@ static void Nck_ShowFormChangeUsrNickname (const struct UsrData *UsrDat,bool Its NumNicks ? Txt_New_nickname : // A new nickname Txt_Nickname); // The first nickname if (ItsMe) - Act_StartFormAnchor (ActChgNicMe,Nck_NICKNAME_SECTION_ID); + Frm_StartFormAnchor (ActChgNicMe,Nck_NICKNAME_SECTION_ID); else { switch (UsrDat->Roles.InCurrentCrs.Role) @@ -395,7 +396,7 @@ static void Nck_ShowFormChangeUsrNickname (const struct UsrData *UsrDat,bool Its NextAction = ActChgNicOth; break; } - Act_StartFormAnchor (NextAction,Nck_NICKNAME_SECTION_ID); + Frm_StartFormAnchor (NextAction,Nck_NICKNAME_SECTION_ID); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); } fprintf (Gbl.F.Out,"" ""); diff --git a/swad_notice.c b/swad_notice.c index 014417d8..cb846213 100644 --- a/swad_notice.c +++ b/swad_notice.c @@ -34,6 +34,7 @@ #include "swad_box.h" #include "swad_database.h" +#include "swad_form.h" #include "swad_global.h" #include "swad_notice.h" #include "swad_notification.h" @@ -103,7 +104,7 @@ void Not_ShowFormNotice (void) Ale_ShowAlert (Ale_INFO,Gbl.Alert.Txt); /***** Start form *****/ - Act_StartForm (ActRcvNot); + Frm_StartForm (ActRcvNot); /***** Start box *****/ Box_StartBox (NULL,Txt_New_notice,NULL, @@ -118,7 +119,7 @@ void Not_ShowFormNotice (void) Box_EndBoxWithButton (Btn_CREATE_BUTTON,Txt_Create_notice); /***** End form *****/ - Act_EndForm (); + Frm_EndForm (); /***** Show all notices *****/ Not_ShowNotices (Not_LIST_FULL_NOTICES); @@ -534,9 +535,9 @@ static void Not_PutButtonToAddNewNotice (void) { extern const char *Txt_New_notice; - Act_StartForm (ActWriNot); + Frm_StartForm (ActWriNot); Btn_PutConfirmButton (Txt_New_notice); - Act_EndForm (); + Frm_EndForm (); } /*****************************************************************************/ @@ -665,7 +666,7 @@ static void Not_DrawANotice (Not_Listing_t TypeNoticesListing, NULL); break; } - Act_EndForm (); + Frm_EndForm (); } else // Don't put forms /* Status of the notice */ @@ -703,16 +704,16 @@ static void Not_DrawANotice (Not_Listing_t TypeNoticesListing, if (TypeNoticesListing == Not_LIST_BRIEF_NOTICES) { /* Form to view full notice */ - Act_StartForm (ActSeeOneNot); + Frm_StartForm (ActSeeOneNot); Not_PutHiddenParamNotCod (NotCod); - Act_LinkFormSubmit (Txt_See_full_notice,DateClass[Status],NULL); + Frm_LinkFormSubmit (Txt_See_full_notice,DateClass[Status],NULL); } fprintf (Gbl.F.Out,"", UniqueId); if (TypeNoticesListing == Not_LIST_BRIEF_NOTICES) { fprintf (Gbl.F.Out,""); - Act_EndForm (); + Frm_EndForm (); } fprintf (Gbl.F.Out,"
    "); if (ICanModerateForum) { - Act_StartFormAnchor (Enabled ? For_ActionsDisPstFor[Gbl.Forum.ForumSelected.Type] : + Frm_StartFormAnchor (Enabled ? For_ActionsDisPstFor[Gbl.Forum.ForumSelected.Type] : For_ActionsEnbPstFor[Gbl.Forum.ForumSelected.Type], For_FORUM_POSTS_SECTION_ID); For_PutAllHiddenParamsForum (Gbl.Forum.CurrentPageThrs, // Page of threads = current @@ -1247,7 +1248,7 @@ static void For_ShowAForumPost (unsigned PstNum,long PstCod, "eye-slash", Gbl.Title, Gbl.Title); - Act_EndForm (); + Frm_EndForm (); } else { @@ -1276,10 +1277,10 @@ static void For_ShowAForumPost (unsigned PstNum,long PstCod, { // Post can be removed if post is the last (without answers) and it's mine if (PstNum == 1) // First and unique post in thread - Act_StartFormAnchor (For_ActionsDelPstFor[Gbl.Forum.ForumSelected.Type], + Frm_StartFormAnchor (For_ActionsDelPstFor[Gbl.Forum.ForumSelected.Type], For_FORUM_THREADS_SECTION_ID); else // Last of several posts in thread - Act_StartFormAnchor (For_ActionsDelPstFor[Gbl.Forum.ForumSelected.Type], + Frm_StartFormAnchor (For_ActionsDelPstFor[Gbl.Forum.ForumSelected.Type], For_FORUM_POSTS_SECTION_ID); For_PutAllHiddenParamsForum (Gbl.Forum.CurrentPageThrs, // Page of threads = current Gbl.Forum.CurrentPagePsts, // Page of posts = current @@ -1289,7 +1290,7 @@ static void For_ShowAForumPost (unsigned PstNum,long PstCod, Gbl.Forum.ForumSelected.ThrCod, PstCod); Ico_PutIconRemove (); - Act_EndForm (); + Frm_EndForm (); } } fprintf (Gbl.F.Out,""); - Act_StartFormAnchor (For_ActionsSeeFor[Gbl.Forum.ForumSelected.Type], + Frm_StartFormAnchor (For_ActionsSeeFor[Gbl.Forum.ForumSelected.Type], For_FORUM_THREADS_SECTION_ID); For_PutAllHiddenParamsForum (Gbl.Forum.CurrentPageThrs, // Page of threads = current 1, // Page of posts = first @@ -2591,14 +2592,14 @@ static void For_ShowForumThreadsHighlightingOneThread (long ThrCodHighlighted, Gbl.Forum.ForumSelected.Location, -1L, -1L); - Act_LinkFormSubmit (Txt_FORUM_THREAD_HELP_ORDER[Order],"TIT_TBL",NULL); + Frm_LinkFormSubmit (Txt_FORUM_THREAD_HELP_ORDER[Order],"TIT_TBL",NULL); if (Order == Gbl.Forum.ThreadsOrder) fprintf (Gbl.F.Out,""); fprintf (Gbl.F.Out,"%s",Txt_FORUM_THREAD_ORDER[Order]); if (Order == Gbl.Forum.ThreadsOrder) fprintf (Gbl.F.Out,""); fprintf (Gbl.F.Out,""); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,"" @@ -3459,7 +3460,7 @@ static void For_ListForumThrs (long ThrCods[Pag_ITEMS_PER_PAGE], (1 << Gbl.Usrs.Me.Role.Logged)) // If I have permission to remove thread in this forum... { fprintf (Gbl.F.Out,"
    "); - Act_StartFormAnchor (For_ActionsReqDelThr[Gbl.Forum.ForumSelected.Type], + Frm_StartFormAnchor (For_ActionsReqDelThr[Gbl.Forum.ForumSelected.Type], For_REMOVE_THREAD_SECTION_ID); For_PutAllHiddenParamsForum (Gbl.Forum.CurrentPageThrs, // Page of threads = current 1, // Page of posts = first @@ -3469,14 +3470,14 @@ static void For_ListForumThrs (long ThrCods[Pag_ITEMS_PER_PAGE], Thr.ThrCod, -1L); Ico_PutIconRemove (); - Act_EndForm (); + Frm_EndForm (); } /***** Put button to cut the thread for moving it to another forum *****/ if (ICanMoveThreads) { fprintf (Gbl.F.Out,"
    "); - Act_StartFormAnchor (For_ActionsCutThrFor[Gbl.Forum.ForumSelected.Type], + Frm_StartFormAnchor (For_ActionsCutThrFor[Gbl.Forum.ForumSelected.Type], For_FORUM_THREADS_SECTION_ID); For_PutAllHiddenParamsForum (Gbl.Forum.CurrentPageThrs, // Page of threads = current 1, // Page of posts = first @@ -3491,7 +3492,7 @@ static void For_ListForumThrs (long ThrCods[Pag_ITEMS_PER_PAGE], Gbl.Prefs.IconsURL, Txt_Move_thread, Txt_Move_thread); - Act_EndForm (); + Frm_EndForm (); } fprintf (Gbl.F.Out,""); @@ -3966,13 +3967,13 @@ static void For_WriteFormForumPst (bool IsReply,const char *Subject) /***** Start form *****/ if (IsReply) // Form to write a reply to a post of an existing thread { - Act_StartFormAnchor (For_ActionsRecRepFor[Gbl.Forum.ForumSelected.Type], + Frm_StartFormAnchor (For_ActionsRecRepFor[Gbl.Forum.ForumSelected.Type], For_FORUM_POSTS_SECTION_ID); For_PutAllHiddenParamsNewPost (); } else // Form to write the first post of a new thread { - Act_StartFormAnchor (For_ActionsRecThrFor[Gbl.Forum.ForumSelected.Type], + Frm_StartFormAnchor (For_ActionsRecThrFor[Gbl.Forum.ForumSelected.Type], For_FORUM_POSTS_SECTION_ID); For_PutAllHiddenParamsNewThread (); } @@ -4024,7 +4025,7 @@ static void For_WriteFormForumPst (bool IsReply,const char *Subject) Btn_PutCreateButton (Txt_Send); /***** End form *****/ - Act_EndForm (); + Frm_EndForm (); /***** End box *****/ Box_EndBox (); diff --git a/swad_game.c b/swad_game.c index c0dc1485..2a4ab5c8 100644 --- a/swad_game.c +++ b/swad_game.c @@ -35,6 +35,7 @@ #include "swad_alert.h" #include "swad_box.h" #include "swad_database.h" +#include "swad_form.h" #include "swad_game.h" #include "swad_global.h" #include "swad_group.h" @@ -238,18 +239,18 @@ static void Gam_ListAllGames (void) fprintf (Gbl.F.Out,"    		"); /* Form to change order */ - Act_StartForm (ActSeeAllGam); + Frm_StartForm (ActSeeAllGam); Grp_PutParamWhichGrps (); Pag_PutHiddenParamPagNum (Pag_GAMES,Gbl.Games.CurrentPage); Par_PutHiddenParamUnsigned ("Order",(unsigned) Order); - Act_LinkFormSubmit (Txt_START_END_TIME_HELP[Order],"TIT_TBL",NULL); + Frm_LinkFormSubmit (Txt_START_END_TIME_HELP[Order],"TIT_TBL",NULL); if (Order == Gbl.Games.SelectedOrder) fprintf (Gbl.F.Out,""); fprintf (Gbl.F.Out,"%s",Txt_START_END_TIME[Order]); if (Order == Gbl.Games.SelectedOrder) fprintf (Gbl.F.Out,""); fprintf (Gbl.F.Out,""); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,"",Gbl.RowEvenOdd); /* Put icon to remove the question */ - Act_StartForm (ActReqRemGamQst); + Frm_StartForm (ActReqRemGamQst); Gam_PutParamGameCod (Game->GamCod); Gam_PutParamQstCod (QstCod); Ico_PutIconRemove (); - Act_EndForm (); + Frm_EndForm (); /* Put icon to move up the question */ if (NumQst) @@ -2994,10 +2995,10 @@ static void Gam_PutButtonToAddNewQuestions (void) { extern const char *Txt_Add_questions; - Act_StartForm (ActAddOneGamQst); + Frm_StartForm (ActAddOneGamQst); Gam_PutParams (); Btn_PutConfirmButton (Txt_Add_questions); - Act_EndForm (); + Frm_EndForm (); } /*****************************************************************************/ @@ -3493,19 +3494,19 @@ static void Gam_PutBigButtonToStartGame (long GamCod) extern const char *Txt_Play; /***** Start form *****/ - Act_StartForm (ActPlyGam1stQst); + Frm_StartForm (ActPlyGam1stQst); Gam_PutParamGameCod (GamCod); Gam_PutParamQstInd (0); // Start by first question in game /***** Put icon with link *****/ - Act_LinkFormSubmit (Txt_Play,NULL,NULL); + Frm_LinkFormSubmit (Txt_Play,NULL,NULL); fprintf (Gbl.F.Out,"\"%s\"", Gbl.Prefs.IconsURL,Txt_Play,Txt_Play); fprintf (Gbl.F.Out,""); /***** End form *****/ - Act_EndForm (); + Frm_EndForm (); } /*****************************************************************************/ @@ -3640,12 +3641,12 @@ static void Gam_PutBigButtonToContinue (Act_Action_t NextAction, fprintf (Gbl.F.Out,"
    "); /***** Start form *****/ - Act_StartForm (NextAction); + Frm_StartForm (NextAction); Gam_PutParamGameCod (GamCod); Gam_PutParamQstInd (QstInd); /***** Put icon with link *****/ - Act_LinkFormSubmit (Txt_Continue,"GAM_PLAY_CONTINUE ICO_HIGHLIGHT",NULL); + Frm_LinkFormSubmit (Txt_Continue,"GAM_PLAY_CONTINUE ICO_HIGHLIGHT",NULL); fprintf (Gbl.F.Out,"\"%s\"" "
    " @@ -3655,7 +3656,7 @@ static void Gam_PutBigButtonToContinue (Act_Action_t NextAction, fprintf (Gbl.F.Out,""); /***** End form *****/ - Act_EndForm (); + Frm_EndForm (); /***** End container *****/ fprintf (Gbl.F.Out,"
    "); diff --git a/swad_global.c b/swad_global.c index 763067df..ec9e8281 100644 --- a/swad_global.c +++ b/swad_global.c @@ -152,6 +152,7 @@ void Gbl_InitializeGlobals (void) Gbl.Session.NumSessions = 0; Gbl.Session.IsOpen = false; Gbl.Session.HasBeenDisconnected = false; + Gbl.Session.Id[0] = '\0'; Gbl.Usrs.Me.UsrIdLogin[0] = '\0'; Gbl.Usrs.Me.LoginPlainPassword[0] = '\0'; diff --git a/swad_group.c b/swad_group.c index a8aa1916..f7de15c6 100644 --- a/swad_group.c +++ b/swad_group.c @@ -34,6 +34,7 @@ #include "swad_action.h" #include "swad_box.h" #include "swad_database.h" +#include "swad_form.h" #include "swad_game.h" #include "swad_global.h" #include "swad_group.h" @@ -380,7 +381,7 @@ void Grp_ShowFormToSelectSeveralGroups (Act_Action_t NextAction, /***** Start form to update the students listed depending on the groups selected *****/ - Act_StartFormAnchor (NextAction,Usr_USER_LIST_SECTION_ID); + Frm_StartFormAnchor (NextAction,Usr_USER_LIST_SECTION_ID); Usr_PutParamsPrefsAboutUsrList (); /***** Put parameters needed depending on the action *****/ @@ -408,7 +409,7 @@ void Grp_ShowFormToSelectSeveralGroups (Act_Action_t NextAction, /***** Submit button *****/ fprintf (Gbl.F.Out,"
    "); - Act_LinkFormSubmitAnimated (Txt_Update_users_according_to_selected_groups, + Frm_LinkFormSubmitAnimated (Txt_Update_users_according_to_selected_groups, The_ClassFormBold[Gbl.Prefs.Theme], "CopyMessageToHiddenFields()"); Ico_PutCalculateIconWithText (Txt_Update_users_according_to_selected_groups, @@ -416,7 +417,7 @@ void Grp_ShowFormToSelectSeveralGroups (Act_Action_t NextAction, fprintf (Gbl.F.Out,"
    "); /***** End form *****/ - Act_EndForm (); + Frm_EndForm (); /***** End box *****/ Box_EndBox (); @@ -1304,15 +1305,15 @@ static void Grp_ListGroupTypesForEdition (void) /* Put icon to remove group type */ fprintf (Gbl.F.Out,"
    "); - Act_StartFormAnchor (ActReqRemGrpTyp,Grp_GROUP_TYPES_SECTION_ID); + Frm_StartFormAnchor (ActReqRemGrpTyp,Grp_GROUP_TYPES_SECTION_ID); Grp_PutParamGrpTypCod (Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].GrpTypCod); Ico_PutIconRemove (); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,""); - Act_StartFormAnchor (ActRenGrpTyp,Grp_GROUP_TYPES_SECTION_ID); + Frm_StartFormAnchor (ActRenGrpTyp,Grp_GROUP_TYPES_SECTION_ID); Grp_PutParamGrpTypCod (Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].GrpTypCod); fprintf (Gbl.F.Out,""); /* Is it mandatory to register in any group? */ fprintf (Gbl.F.Out,""); - Act_StartFormAnchor (ActChgMdtGrpTyp,Grp_GROUP_TYPES_SECTION_ID); + Frm_StartFormAnchor (ActChgMdtGrpTyp,Grp_GROUP_TYPES_SECTION_ID); Grp_PutParamGrpTypCod (Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].GrpTypCod); fprintf (Gbl.F.Out,"", Txt_It_is_mandatory_to_choose_a_group); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,""); - Act_StartFormAnchor (ActChgMulGrpTyp,Grp_GROUP_TYPES_SECTION_ID); + Frm_StartFormAnchor (ActChgMulGrpTyp,Grp_GROUP_TYPES_SECTION_ID); Grp_PutParamGrpTypCod (Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].GrpTypCod); fprintf (Gbl.F.Out,"", Txt_A_student_can_belong_to_several_groups); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,""); - Act_StartFormAnchor (ActChgTimGrpTyp,Grp_GROUP_TYPES_SECTION_ID); + Frm_StartFormAnchor (ActChgTimGrpTyp,Grp_GROUP_TYPES_SECTION_ID); Grp_PutParamGrpTypCod (Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].GrpTypCod); Tbl_StartTableCenter (2); fprintf (Gbl.F.Out,"
    "); - Act_StartFormAnchor (ActReqRemGrp,Grp_GROUPS_SECTION_ID); + Frm_StartFormAnchor (ActReqRemGrp,Grp_GROUPS_SECTION_ID); Grp_PutParamGrpCod (Grp->GrpCod); Ico_PutIconRemove (); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,""); - Act_StartFormAnchor (Grp->Open ? ActCloGrp : + Frm_StartFormAnchor (Grp->Open ? ActCloGrp : ActOpeGrp, Grp_GROUPS_SECTION_ID); Grp_PutParamGrpCod (Grp->GrpCod); @@ -1543,12 +1544,12 @@ static void Grp_ListGroupsForEdition (void) "lock", Gbl.Title, Gbl.Title); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,""); - Act_StartFormAnchor (Grp->FileZones ? ActDisFilZonGrp : + Frm_StartFormAnchor (Grp->FileZones ? ActDisFilZonGrp : ActEnaFilZonGrp, Grp_GROUPS_SECTION_ID); Grp_PutParamGrpCod (Grp->GrpCod); @@ -1564,12 +1565,12 @@ static void Grp_ListGroupsForEdition (void) "folder-no", Gbl.Title, Gbl.Title); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,""); - Act_StartFormAnchor (ActChgGrpTyp,Grp_GROUPS_SECTION_ID); + Frm_StartFormAnchor (ActChgGrpTyp,Grp_GROUPS_SECTION_ID); Grp_PutParamGrpCod (Grp->GrpCod); fprintf (Gbl.F.Out,""); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,""); - Act_StartFormAnchor (ActRenGrp,Grp_GROUPS_SECTION_ID); + Frm_StartFormAnchor (ActRenGrp,Grp_GROUPS_SECTION_ID); Grp_PutParamGrpCod (Grp->GrpCod); fprintf (Gbl.F.Out,"", Grp_MAX_CHARS_GROUP_NAME,Grp->GrpName,Gbl.Form.Id); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,""); - Act_StartFormAnchor (ActChgMaxStdGrp,Grp_GROUPS_SECTION_ID); + Frm_StartFormAnchor (ActChgMaxStdGrp,Grp_GROUPS_SECTION_ID); Grp_PutParamGrpCod (Grp->GrpCod); fprintf (Gbl.F.Out,"MaxStudents); fprintf (Gbl.F.Out,"\" onchange=\"document.getElementById('%s').submit();\" />", Gbl.Form.Id); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,"
    "); - Act_StartForm (Action); + Frm_StartForm (Action); Btn_PutButtonInline (Button,TxtButton); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,"
    "); - Act_StartForm (ActSeeHld); + Frm_StartForm (ActSeeHld); Par_PutHiddenParamUnsigned ("Order",(unsigned) Order); - Act_LinkFormSubmit (Txt_HOLIDAYS_HELP_ORDER[Order],"TIT_TBL",NULL); + Frm_LinkFormSubmit (Txt_HOLIDAYS_HELP_ORDER[Order],"TIT_TBL",NULL); if (Order == Gbl.Hlds.SelectedOrder) fprintf (Gbl.F.Out,""); fprintf (Gbl.F.Out,"%s",Txt_HOLIDAYS_ORDER[Order]); if (Order == Gbl.Hlds.SelectedOrder) fprintf (Gbl.F.Out,""); fprintf (Gbl.F.Out,""); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,"" @@ -181,9 +182,9 @@ void Hld_SeeHolidays (void) /***** Button to create centre *****/ if (Gbl.Usrs.Me.Role.Logged >= Rol_INS_ADM) // Institution admin or system admin { - Act_StartForm (ActEdiHld); + Frm_StartForm (ActEdiHld); Btn_PutConfirmButton (Txt_New_holiday); - Act_EndForm (); + Frm_EndForm (); } /***** End table and box *****/ @@ -534,10 +535,10 @@ static void Hld_ListHolidaysForEdition (void) /* Put icon to remove holiday */ fprintf (Gbl.F.Out,"
    "); - Act_StartForm (ActRemHld); + Frm_StartForm (ActRemHld); Hld_PutParamHldCod (Hld->HldCod); Ico_PutIconRemove (); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,""); - Act_StartForm (ActChgHldPlc); + Frm_StartForm (ActChgHldPlc); Hld_PutParamHldCod (Hld->HldCod); fprintf (Gbl.F.Out,""); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,""); - Act_StartForm (ActChgHldTyp); + Frm_StartForm (ActChgHldTyp); Hld_PutParamHldCod (Hld->HldCod); fprintf (Gbl.F.Out,""); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,""); - Act_StartForm (ActChgHldStrDat); + Frm_StartForm (ActChgHldStrDat); Hld_PutParamHldCod (Hld->HldCod); Dat_WriteFormDate (Gbl.Now.Date.Year - 1, Gbl.Now.Date.Year + 1, "Start", &(Gbl.Hlds.Lst[NumHld].StartDate), true,false); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,""); - Act_StartForm (ActChgHldEndDat); + Frm_StartForm (ActChgHldEndDat); Hld_PutParamHldCod (Hld->HldCod); Dat_WriteFormDate (Gbl.Now.Date.Year - 1, Gbl.Now.Date.Year + 1, "End", &(Gbl.Hlds.Lst[NumHld].EndDate), true,(Hld->HldTyp == Hld_HOLIDAY)); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,""); - Act_StartForm (ActRenHld); + Frm_StartForm (ActRenHld); Hld_PutParamHldCod (Hld->HldCod); fprintf (Gbl.F.Out,"", Hld_MAX_CHARS_HOLIDAY_NAME,Hld->Name,Gbl.Form.Id); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,"
    "); if (ICanEdit) { - Act_StartForm (ActRenInsSho); + Frm_StartForm (ActRenInsSho); Ins_PutParamOtherInsCod (Ins->InsCod); fprintf (Gbl.F.Out,"", Hie_MAX_CHARS_SHRT_NAME,Ins->ShrtName, Gbl.Form.Id); - Act_EndForm (); + Frm_EndForm (); } else fprintf (Gbl.F.Out,"%s",Ins->ShrtName); @@ -1492,7 +1493,7 @@ static void Ins_ListInstitutionsForEdition (void) fprintf (Gbl.F.Out,""); if (ICanEdit) { - Act_StartForm (ActRenInsFul); + Frm_StartForm (ActRenInsFul); Ins_PutParamOtherInsCod (Ins->InsCod); fprintf (Gbl.F.Out,"FullName, Gbl.Form.Id); - Act_EndForm (); + Frm_EndForm (); } else fprintf (Gbl.F.Out,"%s",Ins->FullName); @@ -1511,7 +1512,7 @@ static void Ins_ListInstitutionsForEdition (void) fprintf (Gbl.F.Out,""); if (ICanEdit) { - Act_StartForm (ActChgInsWWW); + Frm_StartForm (ActChgInsWWW); Ins_PutParamOtherInsCod (Ins->InsCod); fprintf (Gbl.F.Out,"WWW, Gbl.Form.Id); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,"
    "); - Act_StartForm (ActRemLnk); + Frm_StartForm (ActRemLnk); Lnk_PutParamLnkCod (Lnk->LnkCod); Ico_PutIconRemove (); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,""); - Act_StartForm (ActRenLnkSho); + Frm_StartForm (ActRenLnkSho); Lnk_PutParamLnkCod (Lnk->LnkCod); fprintf (Gbl.F.Out,"", Lnk_MAX_CHARS_LINK_SHRT_NAME,Lnk->ShrtName, Gbl.Form.Id); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,""); - Act_StartForm (ActRenLnkFul); + Frm_StartForm (ActRenLnkFul); Lnk_PutParamLnkCod (Lnk->LnkCod); fprintf (Gbl.F.Out,"", Lnk_MAX_CHARS_LINK_FULL_NAME,Lnk->FullName, Gbl.Form.Id); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,""); - Act_StartForm (ActChgLnkWWW); + Frm_StartForm (ActChgLnkWWW); Lnk_PutParamLnkCod (Lnk->LnkCod); fprintf (Gbl.F.Out,"", Cns_MAX_CHARS_WWW,Lnk->WWW, Gbl.Form.Id); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,"
    "); - Act_StartForm (ActSeeMai); + Frm_StartForm (ActSeeMai); Par_PutHiddenParamUnsigned ("Order",(unsigned) Order); - Act_LinkFormSubmit (Txt_EMAIL_DOMAIN_HELP_ORDER[Order],"TIT_TBL",NULL); + Frm_LinkFormSubmit (Txt_EMAIL_DOMAIN_HELP_ORDER[Order],"TIT_TBL",NULL); if (Order == Gbl.Mails.SelectedOrder) fprintf (Gbl.F.Out,""); fprintf (Gbl.F.Out,"%s",Txt_EMAIL_DOMAIN_ORDER[Order]); if (Order == Gbl.Mails.SelectedOrder) fprintf (Gbl.F.Out,""); fprintf (Gbl.F.Out,""); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,"
    "); - Act_StartForm (ActRemMai); + Frm_StartForm (ActRemMai); Mai_PutParamMaiCod (Mai->MaiCod); Ico_PutIconRemove (); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,""); - Act_StartForm (ActRenMaiSho); + Frm_StartForm (ActRenMaiSho); Mai_PutParamMaiCod (Mai->MaiCod); fprintf (Gbl.F.Out,"", Cns_MAX_CHARS_EMAIL_ADDRESS,Mai->Domain, Gbl.Form.Id); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,""); - Act_StartForm (ActRenMaiFul); + Frm_StartForm (ActRenMaiFul); Mai_PutParamMaiCod (Mai->MaiCod); fprintf (Gbl.F.Out,"", Mai_MAX_CHARS_MAIL_INFO,Mai->Info, Gbl.Form.Id); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,"
    "); - Act_StartForm (ActionSee[Gbl.Msg.TypeOfMessages]); + Frm_StartForm (ActionSee[Gbl.Msg.TypeOfMessages]); Gbl.Msg.MsgCod = MsgCod; // Message to be expanded with all recipients visible Msg_PutHiddenParamsOneMsg (); Par_PutHiddenParamChar ("SeeAllRcpts",'Y'); - Act_LinkFormSubmit (Txt_View_all_recipients,"AUTHOR_TXT",NULL); + Frm_LinkFormSubmit (Txt_View_all_recipients,"AUTHOR_TXT",NULL); fprintf (Gbl.F.Out,Txt_and_X_other_recipients, NumRecipientsKnown - NumRecipientsToShow); fprintf (Gbl.F.Out,""); - Act_EndForm (); + Frm_EndForm (); fprintf (Gbl.F.Out,"
    "); - Act_StartForm (ActUnbUsrLst); + Frm_StartForm (ActUnbUsrLst); Usr_PutParamUsrCodEncrypted (UsrDat.EncryptedUsrCod); fprintf (Gbl.F.Out,""); /* Show photo */ diff --git a/swad_network.c b/swad_network.c index cdc3899b..2016ecc9 100644 --- a/swad_network.c +++ b/swad_network.c @@ -31,6 +31,7 @@ #include "swad_box.h" #include "swad_database.h" +#include "swad_form.h" #include "swad_global.h" #include "swad_parameter.h" #include "swad_profile.h" @@ -335,7 +336,7 @@ void Net_ShowFormMyWebsAndSocialNets (void) Net_WebsAndSocialNetworksTitle[NumURL], Net_WebsAndSocialNetworksTitle[NumURL], Net_WebsAndSocialNetworksTitle[NumURL]); - Act_StartFormAnchor (ActChgMyNet,Net_MY_WEBS_ID); + Frm_StartFormAnchor (ActChgMyNet,Net_MY_WEBS_ID); Par_PutHiddenParamUnsigned ("Web",(unsigned) NumURL); fprintf (Gbl.F.Out,"" "