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,"",
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,"
");
@@ -306,14 +307,14 @@ void MFU_WriteSmallMFUActions (struct MFU_ListMFUActions *ListMFUActions)
/* Icon and text */
fprintf (Gbl.F.Out,"- ");
- Act_StartForm (Action);
- Act_LinkFormSubmit (TabMenuStr,NULL,NULL);
+ Frm_StartForm (Action);
+ Frm_LinkFormSubmit (TabMenuStr,NULL,NULL);
fprintf (Gbl.F.Out,"",
Gbl.Prefs.PathIconSet,Cfg_ICON_ACTION,
Act_GetIcon (Action),
MenuStr);
fprintf (Gbl.F.Out," %s",MenuStr);
- Act_EndForm ();
+ Frm_EndForm ();
fprintf (Gbl.F.Out,"
");
}
}
diff --git a/swad_account.c b/swad_account.c
index 424741d0..cb90a7ee 100644
--- a/swad_account.c
+++ b/swad_account.c
@@ -35,6 +35,7 @@
#include "swad_duplicate.h"
#include "swad_enrolment.h"
#include "swad_follow.h"
+#include "swad_form.h"
#include "swad_global.h"
#include "swad_ID.h"
#include "swad_language.h"
@@ -149,7 +150,7 @@ static void Acc_ShowFormCheckIfIHaveAccount (const char *Title)
Ale_ShowAlert (Ale_INFO,Txt_If_you_think_you_may_have_been_registered_);
/***** Form to request user's ID for possible account already created *****/
- Act_StartForm (ActChkUsrAcc);
+ Frm_StartForm (ActChkUsrAcc);
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,"
"
@@ -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," |