diff --git a/swad_API.c b/swad_API.c index d478ee03..278a4eb0 100644 --- a/swad_API.c +++ b/swad_API.c @@ -1195,7 +1195,7 @@ int swad__getCourseInfo (struct soap *soap, int Result = SOAP_OK; const char *NamesInWSForInfoType[Inf_NUM_TYPES] = { - [Inf_INTRODUCTION ] = "introduction", + [Inf_INFORMATION ] = "introduction", [Inf_TEACHING_GUIDE] = "guide", [Inf_LECTURES ] = "lectures", [Inf_PRACTICALS ] = "practicals", diff --git a/swad_ID.c b/swad_ID.c index c86e83b7..4f4c6d51 100644 --- a/swad_ID.c +++ b/swad_ID.c @@ -393,7 +393,7 @@ static void ID_PutLinkToConfirmID (struct Usr_Data *UsrDat,unsigned NumID, const char *Anchor) { extern const char *Txt_Confirm_ID; - static const Act_Action_t NextAction[Rol_NUM_ROLES] = + static Act_Action_t NextAction[Rol_NUM_ROLES] = { [Rol_UNK ] = ActCnfID_Oth, [Rol_GST ] = ActCnfID_Oth, diff --git a/swad_account.c b/swad_account.c index 4e2764ce..e5adb73d 100644 --- a/swad_account.c +++ b/swad_account.c @@ -1076,7 +1076,7 @@ static void Acc_RemoveUsrBriefcase (struct Usr_Data *UsrDat) void Acc_PutIconToChangeUsrAccount (struct Usr_Data *UsrDat) { - static const Act_Action_t NextAction[Rol_NUM_ROLES] = + static Act_Action_t NextAction[Rol_NUM_ROLES] = { [Rol_UNK ] = ActFrmAccOth, [Rol_GST ] = ActFrmAccOth, diff --git a/swad_action.c b/swad_action.c index 5b9621d2..3b224f86 100644 --- a/swad_action.c +++ b/swad_action.c @@ -240,7 +240,7 @@ const char *Act_GetActionText (Act_Action_t Action) void Act_AdjustActionWhenNoUsrLogged (void) { - static const Act_Action_t Actions[Hie_NUM_LEVELS] = + static Act_Action_t Actions[Hie_NUM_LEVELS] = { [Hie_UNK] = ActUnk, // Unknown [Hie_SYS] = ActFrmLogIn, // System diff --git a/swad_action.h b/swad_action.h index b853f6ce..d3e0d8be 100644 --- a/swad_action.h +++ b/swad_action.h @@ -89,6 +89,13 @@ struct Act_Actions void (*FunctionPosteriori) (); }; +struct Act_ActionFunc + { + Act_Action_t NextAction; + void (*FuncPars) (void *Args); + void *Args; + }; + /*****************************************************************************/ /***************************** Public prototypes *****************************/ /*****************************************************************************/ diff --git a/swad_action_list.c b/swad_action_list.c index 01e2d13d..03a0313e 100644 --- a/swad_action_list.c +++ b/swad_action_list.c @@ -208,7 +208,7 @@ const struct Act_Actions ActLst_Actions[ActLst_NUM_ACTIONS] = [ActMrkNtfSee ] = {1146,-1,TabUnk,ActSeeNtf ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_1ST_TAB,NULL ,Ntf_MarkAllNotifAsSeen }, [ActSeeMai ] = { 855,-1,TabUnk,ActSeeNtf ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_1ST_TAB,NULL ,Mai_SeeMailDomains }, [ActEdiMai ] = { 856,-1,TabUnk,ActSeeNtf ,0x200,0x200,0x200,0x200,0x200,0x200,0x200,Act_CONT_NORM,Act_1ST_TAB,NULL ,Mai_EditMailDomains }, - [ActNewMai ] = { 857,-1,TabUnk,ActSeeNtf ,0x200,0x200,0x200,0x200,0x200,0x200,0x200,Act_CONT_NORM,Act_1ST_TAB,Mai_ReceiveFormNewMailDomain,Mai_ContEditAfterChgMai }, + [ActNewMai ] = { 857,-1,TabUnk,ActSeeNtf ,0x200,0x200,0x200,0x200,0x200,0x200,0x200,Act_CONT_NORM,Act_1ST_TAB,Mai_ReceiveNewMailDomain ,Mai_ContEditAfterChgMai }, [ActRemMai ] = { 860,-1,TabUnk,ActSeeNtf ,0x200,0x200,0x200,0x200,0x200,0x200,0x200,Act_CONT_NORM,Act_1ST_TAB,Mai_RemoveMailDomain ,Mai_ContEditAfterChgMai }, [ActRenMaiSho ] = { 858,-1,TabUnk,ActSeeNtf ,0x200,0x200,0x200,0x200,0x200,0x200,0x200,Act_CONT_NORM,Act_1ST_TAB,Mai_RenameMailDomainShort ,Mai_ContEditAfterChgMai }, [ActRenMaiFul ] = { 859,-1,TabUnk,ActSeeNtf ,0x200,0x200,0x200,0x200,0x200,0x200,0x200,Act_CONT_NORM,Act_1ST_TAB,Mai_RenameMailDomainFull ,Mai_ContEditAfterChgMai }, @@ -221,7 +221,7 @@ const struct Act_Actions ActLst_Actions[ActLst_NUM_ACTIONS] = // Countries [ActSeeCty ] = { 862, 1,TabSys,ActSeeCty , 0, 0, 0, 0, 0, 0,0x3C7,Act_CONT_NORM,Act_1ST_TAB,Cty_ListCountries1 ,Cty_ListCountries2 }, [ActEdiCty ] = { 863,-1,TabUnk,ActSeeCty , 0, 0, 0, 0, 0, 0,0x200,Act_CONT_NORM,Act_1ST_TAB,NULL ,Cty_EditCountries }, - [ActNewCty ] = { 864,-1,TabUnk,ActSeeCty , 0, 0, 0, 0, 0, 0,0x200,Act_CONT_NORM,Act_1ST_TAB,Cty_ReceiveFormNewCountry ,Cty_ContEditAfterChgCty }, + [ActNewCty ] = { 864,-1,TabUnk,ActSeeCty , 0, 0, 0, 0, 0, 0,0x200,Act_CONT_NORM,Act_1ST_TAB,Cty_ReceiveNewCountry ,Cty_ContEditAfterChgCty }, [ActRemCty ] = { 893,-1,TabUnk,ActSeeCty , 0, 0, 0, 0, 0, 0,0x200,Act_CONT_NORM,Act_1ST_TAB,Cty_RemoveCountry ,Cty_ContEditAfterChgCty }, [ActRenCty ] = { 866,-1,TabUnk,ActSeeCty , 0, 0, 0, 0, 0, 0,0x200,Act_CONT_NORM,Act_1ST_TAB,Cty_RenameCountry ,Cty_ContEditAfterChgCty }, [ActChgCtyWWW ] = {1157,-1,TabUnk,ActSeeCty , 0, 0, 0, 0, 0, 0,0x200,Act_CONT_NORM,Act_1ST_TAB,Cty_ChangeCtyWWW ,Cty_ContEditAfterChgCty }, @@ -232,14 +232,14 @@ const struct Act_Actions ActLst_Actions[ActLst_NUM_ACTIONS] = // Links [ActSeeLnk ] = { 748, 3,TabSys,ActSeeLnk , 0, 0, 0, 0, 0, 0,0x3C7,Act_CONT_NORM,Act_1ST_TAB,NULL ,Lnk_SeeLinks }, [ActEdiLnk ] = { 749,-1,TabUnk,ActSeeLnk , 0, 0, 0, 0, 0, 0,0x200,Act_CONT_NORM,Act_1ST_TAB,NULL ,Lnk_EditLinks }, - [ActNewLnk ] = { 750,-1,TabUnk,ActSeeLnk , 0, 0, 0, 0, 0, 0,0x200,Act_CONT_NORM,Act_1ST_TAB,Lnk_ReceiveFormNewLink ,Lnk_ContEditAfterChgLnk }, + [ActNewLnk ] = { 750,-1,TabUnk,ActSeeLnk , 0, 0, 0, 0, 0, 0,0x200,Act_CONT_NORM,Act_1ST_TAB,Lnk_ReceiveNewLink ,Lnk_ContEditAfterChgLnk }, [ActRemLnk ] = { 897,-1,TabUnk,ActSeeLnk , 0, 0, 0, 0, 0, 0,0x200,Act_CONT_NORM,Act_1ST_TAB,Lnk_RemoveLink ,Lnk_ContEditAfterChgLnk }, [ActRenLnkSho ] = { 753,-1,TabUnk,ActSeeLnk , 0, 0, 0, 0, 0, 0,0x200,Act_CONT_NORM,Act_1ST_TAB,Lnk_RenameLinkShort ,Lnk_ContEditAfterChgLnk }, [ActRenLnkFul ] = { 751,-1,TabUnk,ActSeeLnk , 0, 0, 0, 0, 0, 0,0x200,Act_CONT_NORM,Act_1ST_TAB,Lnk_RenameLinkFull ,Lnk_ContEditAfterChgLnk }, [ActChgLnkWWW ] = { 752,-1,TabUnk,ActSeeLnk , 0, 0, 0, 0, 0, 0,0x200,Act_CONT_NORM,Act_1ST_TAB,Lnk_ChangeLinkWWW ,Lnk_ContEditAfterChgLnk }, [ActSeeBan ] = {1137,-1,TabUnk,ActSeeLnk , 0, 0, 0, 0, 0, 0,0x3FF,Act_CONT_NORM,Act_1ST_TAB,NULL ,Ban_ShowAllBanners }, [ActEdiBan ] = {1138,-1,TabUnk,ActSeeLnk , 0, 0, 0, 0, 0, 0,0x200,Act_CONT_NORM,Act_1ST_TAB,NULL ,Ban_EditBanners }, - [ActNewBan ] = {1139,-1,TabUnk,ActSeeLnk , 0, 0, 0, 0, 0, 0,0x200,Act_CONT_NORM,Act_1ST_TAB,Ban_ReceiveFormNewBanner ,Ban_ContEditAfterChgBan }, + [ActNewBan ] = {1139,-1,TabUnk,ActSeeLnk , 0, 0, 0, 0, 0, 0,0x200,Act_CONT_NORM,Act_1ST_TAB,Ban_ReceiveNewBanner ,Ban_ContEditAfterChgBan }, [ActRemBan ] = {1140,-1,TabUnk,ActSeeLnk , 0, 0, 0, 0, 0, 0,0x200,Act_CONT_NORM,Act_1ST_TAB,Ban_RemoveBanner ,Ban_ContEditAfterChgBan }, [ActUnhBan ] = {1212,-1,TabUnk,ActSeeLnk , 0, 0, 0, 0, 0, 0,0x200,Act_CONT_NORM,Act_1ST_TAB,Ban_UnhideBanner ,Ban_ContEditAfterChgBan }, [ActHidBan ] = {1213,-1,TabUnk,ActSeeLnk , 0, 0, 0, 0, 0, 0,0x200,Act_CONT_NORM,Act_1ST_TAB,Ban_HideBanner ,Ban_ContEditAfterChgBan }, @@ -252,7 +252,7 @@ const struct Act_Actions ActLst_Actions[ActLst_NUM_ACTIONS] = // Plugins [ActSeePlg ] = { 777, 4,TabSys,ActSeePlg , 0, 0, 0, 0, 0, 0,0x200,Act_CONT_NORM,Act_1ST_TAB,NULL ,Plg_ListPlugins }, [ActEdiPlg ] = { 778,-1,TabUnk,ActSeePlg , 0, 0, 0, 0, 0, 0,0x200,Act_CONT_NORM,Act_1ST_TAB,NULL ,Plg_EditPlugins }, - [ActNewPlg ] = { 779,-1,TabUnk,ActSeePlg , 0, 0, 0, 0, 0, 0,0x200,Act_CONT_NORM,Act_1ST_TAB,Plg_ReceiveFormNewPlg ,Plg_ContEditAfterChgPlg }, + [ActNewPlg ] = { 779,-1,TabUnk,ActSeePlg , 0, 0, 0, 0, 0, 0,0x200,Act_CONT_NORM,Act_1ST_TAB,Plg_ReceiveNewPlg ,Plg_ContEditAfterChgPlg }, [ActRemPlg ] = { 889,-1,TabUnk,ActSeePlg , 0, 0, 0, 0, 0, 0,0x200,Act_CONT_NORM,Act_1ST_TAB,Plg_RemovePlugin ,Plg_ContEditAfterChgPlg }, [ActRenPlg ] = { 782,-1,TabUnk,ActSeePlg , 0, 0, 0, 0, 0, 0,0x200,Act_CONT_NORM,Act_1ST_TAB,Plg_RenamePlugin ,Plg_ContEditAfterChgPlg }, [ActChgPlgDes ] = { 888,-1,TabUnk,ActSeePlg , 0, 0, 0, 0, 0, 0,0x200,Act_CONT_NORM,Act_1ST_TAB,Plg_ChangePlgDescription ,Plg_ContEditAfterChgPlg }, @@ -276,8 +276,8 @@ const struct Act_Actions ActLst_Actions[ActLst_NUM_ACTIONS] = // Institutions [ActSeeIns ] = { 696, 1,TabCty,ActSeeIns , 0, 0, 0, 0, 0,0x3C7, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Ins_ShowInssOfCurrentCty }, [ActEdiIns ] = { 697,-1,TabUnk,ActSeeIns , 0, 0, 0, 0, 0,0x3C6, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Ins_EditInstitutions }, - [ActReqIns ] = {1210,-1,TabUnk,ActSeeIns , 0, 0, 0, 0, 0,0x3C6, 0,Act_CONT_NORM,Act_1ST_TAB,Ins_ReceiveFormReqIns ,Ins_ContEditAfterChgIns }, - [ActNewIns ] = { 698,-1,TabUnk,ActSeeIns , 0, 0, 0, 0, 0,0x200, 0,Act_CONT_NORM,Act_1ST_TAB,Ins_ReceiveFormNewIns ,Ins_ContEditAfterChgIns }, + [ActReqIns ] = {1210,-1,TabUnk,ActSeeIns , 0, 0, 0, 0, 0,0x3C6, 0,Act_CONT_NORM,Act_1ST_TAB,Ins_ReceiveReqIns ,Ins_ContEditAfterChgIns }, + [ActNewIns ] = { 698,-1,TabUnk,ActSeeIns , 0, 0, 0, 0, 0,0x200, 0,Act_CONT_NORM,Act_1ST_TAB,Ins_ReceiveNewIns ,Ins_ContEditAfterChgIns }, [ActRemIns ] = { 759,-1,TabUnk,ActSeeIns , 0, 0, 0, 0, 0,0x3C6, 0,Act_CONT_NORM,Act_1ST_TAB,Ins_RemoveInstitution ,Ins_ContEditAfterChgIns }, [ActRenInsSho ] = { 702,-1,TabUnk,ActSeeIns , 0, 0, 0, 0, 0,0x3C6, 0,Act_CONT_NORM,Act_1ST_TAB,Ins_RenameInsShort ,Ins_ContEditAfterChgIns }, [ActRenInsFul ] = { 701,-1,TabUnk,ActSeeIns , 0, 0, 0, 0, 0,0x3C6, 0,Act_CONT_NORM,Act_1ST_TAB,Ins_RenameInsFull ,Ins_ContEditAfterChgIns }, @@ -299,8 +299,8 @@ const struct Act_Actions ActLst_Actions[ActLst_NUM_ACTIONS] = // Centers [ActSeeCtr ] = { 676, 1,TabIns,ActSeeCtr , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Ctr_ShowCtrsOfCurrentIns }, [ActEdiCtr ] = { 681,-1,TabUnk,ActSeeCtr , 0, 0, 0, 0,0x3C6, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Ctr_EditCenters }, - [ActReqCtr ] = {1208,-1,TabUnk,ActSeeCtr , 0, 0, 0, 0,0x3C6, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Ctr_ReceiveFormReqCtr ,Ctr_ContEditAfterChgCtr }, - [ActNewCtr ] = { 685,-1,TabUnk,ActSeeCtr , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Ctr_ReceiveFormNewCtr ,Ctr_ContEditAfterChgCtr }, + [ActReqCtr ] = {1208,-1,TabUnk,ActSeeCtr , 0, 0, 0, 0,0x3C6, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Ctr_ReceiveReqCtr ,Ctr_ContEditAfterChgCtr }, + [ActNewCtr ] = { 685,-1,TabUnk,ActSeeCtr , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Ctr_ReceiveNewCtr ,Ctr_ContEditAfterChgCtr }, [ActRemCtr ] = { 686,-1,TabUnk,ActSeeCtr , 0, 0, 0, 0,0x3C6, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Ctr_RemoveCenter ,Ctr_ContEditAfterChgCtr }, [ActChgCtrPlc ] = { 706,-1,TabUnk,ActSeeCtr , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Ctr_ChangeCtrPlc ,Ctr_ContEditAfterChgCtr }, [ActRenCtrSho ] = { 682,-1,TabUnk,ActSeeCtr , 0, 0, 0, 0,0x3C6, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Ctr_RenameCenterShort ,Ctr_ContEditAfterChgCtr }, @@ -311,7 +311,7 @@ const struct Act_Actions ActLst_Actions[ActLst_NUM_ACTIONS] = // Places [ActSeePlc ] = { 703, 2,TabIns,ActSeePlc , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Plc_SeeAllPlaces }, [ActEdiPlc ] = { 704,-1,TabUnk,ActSeePlc , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Plc_EditPlaces }, - [ActNewPlc ] = { 705,-1,TabUnk,ActSeePlc , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Plc_ReceiveFormNewPlace ,Plc_ContEditAfterChgPlc }, + [ActNewPlc ] = { 705,-1,TabUnk,ActSeePlc , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Plc_ReceiveNewPlace ,Plc_ContEditAfterChgPlc }, [ActRemPlc ] = { 776,-1,TabUnk,ActSeePlc , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Plc_RemovePlace ,Plc_ContEditAfterChgPlc }, [ActRenPlcSho ] = { 894,-1,TabUnk,ActSeePlc , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Plc_RenamePlaceShort ,Plc_ContEditAfterChgPlc }, [ActRenPlcFul ] = { 895,-1,TabUnk,ActSeePlc , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Plc_RenamePlaceFull ,Plc_ContEditAfterChgPlc }, @@ -319,7 +319,7 @@ const struct Act_Actions ActLst_Actions[ActLst_NUM_ACTIONS] = // Departments [ActSeeDpt ] = { 675, 3,TabIns,ActSeeDpt , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Dpt_SeeAllDepts }, [ActEdiDpt ] = { 677,-1,TabUnk,ActSeeDpt , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Dpt_EditDepartments }, - [ActNewDpt ] = { 687,-1,TabUnk,ActSeeDpt , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Dpt_ReceiveFormNewDpt ,Dpt_ContEditAfterChgDpt }, + [ActNewDpt ] = { 687,-1,TabUnk,ActSeeDpt , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Dpt_ReceiveNewDpt ,Dpt_ContEditAfterChgDpt }, [ActRemDpt ] = { 690,-1,TabUnk,ActSeeDpt , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Dpt_RemoveDepartment ,Dpt_ContEditAfterChgDpt }, [ActChgDptIns ] = { 721,-1,TabUnk,ActSeeDpt , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Dpt_ChangeDepartIns ,Dpt_ContEditAfterChgDpt }, [ActRenDptSho ] = { 688,-1,TabUnk,ActSeeDpt , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Dpt_RenameDepartShort ,Dpt_ContEditAfterChgDpt }, @@ -329,7 +329,7 @@ const struct Act_Actions ActLst_Actions[ActLst_NUM_ACTIONS] = // Holidays [ActSeeHld ] = { 707, 4,TabIns,ActSeeHld , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Hld_SeeAllHolidays }, [ActEdiHld ] = { 713,-1,TabUnk,ActSeeHld , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Hld_EditHolidays }, - [ActNewHld ] = { 714,-1,TabUnk,ActSeeHld , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Hld_ReceiveFormNewHoliday ,Hld_ContEditAfterChgHld }, + [ActNewHld ] = { 714,-1,TabUnk,ActSeeHld , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Hld_ReceiveNewHoliday ,Hld_ContEditAfterChgHld }, [ActRemHld ] = { 716,-1,TabUnk,ActSeeHld , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Hld_RemoveHoliday ,Hld_ContEditAfterChgHld }, [ActChgHldPlc ] = { 896,-1,TabUnk,ActSeeHld , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Hld_ChangeHolidayPlace ,Hld_ContEditAfterChgHld }, [ActChgHldTyp ] = { 715,-1,TabUnk,ActSeeHld , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Hld_ChangeHolidayType ,Hld_ContEditAfterChgHld }, @@ -359,8 +359,8 @@ const struct Act_Actions ActLst_Actions[ActLst_NUM_ACTIONS] = // Degrees [ActSeeDeg ] = {1011, 1,TabCtr,ActSeeDeg , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Deg_ShowDegsOfCurrentCtr }, [ActEdiDeg ] = { 536,-1,TabUnk,ActSeeDeg , 0, 0, 0,0x3C6, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Deg_EditDegrees }, - [ActReqDeg ] = {1206,-1,TabUnk,ActSeeDeg , 0, 0, 0,0x3C6, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Deg_ReceiveFormReqDeg ,Deg_ContEditAfterChgDeg }, - [ActNewDeg ] = { 540,-1,TabUnk,ActSeeDeg , 0, 0, 0,0x380, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Deg_ReceiveFormNewDeg ,Deg_ContEditAfterChgDeg }, + [ActReqDeg ] = {1206,-1,TabUnk,ActSeeDeg , 0, 0, 0,0x3C6, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Deg_ReceiveReqDeg ,Deg_ContEditAfterChgDeg }, + [ActNewDeg ] = { 540,-1,TabUnk,ActSeeDeg , 0, 0, 0,0x380, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Deg_ReceiveNewDeg ,Deg_ContEditAfterChgDeg }, [ActRemDeg ] = { 542,-1,TabUnk,ActSeeDeg , 0, 0, 0,0x3C6, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Deg_RemoveDegree ,Deg_ContEditAfterChgDeg }, [ActRenDegSho ] = { 546,-1,TabUnk,ActSeeDeg , 0, 0, 0,0x3C6, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Deg_RenameDegreeShort ,Deg_ContEditAfterChgDeg }, [ActRenDegFul ] = { 547,-1,TabUnk,ActSeeDeg , 0, 0, 0,0x3C6, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Deg_RenameDegreeFull ,Deg_ContEditAfterChgDeg }, @@ -369,14 +369,14 @@ const struct Act_Actions ActLst_Actions[ActLst_NUM_ACTIONS] = [ActChgDegSta ] = {1207,-1,TabUnk,ActSeeDeg , 0, 0, 0,0x380, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Deg_ChangeDegStatus ,Deg_ContEditAfterChgDeg }, [ActSeeDegTyp ] = {1013,-1,TabUnk,ActSeeDeg , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,DegTyp_SeeDegreeTypesInDegTab }, [ActEdiDegTyp ] = { 573,-1,TabUnk,ActSeeDeg , 0, 0, 0,0x200, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,DegTyp_GetAndEditDegreeTypes }, - [ActNewDegTyp ] = { 537,-1,TabUnk,ActSeeDeg , 0, 0, 0,0x200, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,DegTyp_ReceiveFormNewDegreeType,DegTyp_ContEditAfterChgDegTyp}, + [ActNewDegTyp ] = { 537,-1,TabUnk,ActSeeDeg , 0, 0, 0,0x200, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,DegTyp_ReceiveNewDegreeType,DegTyp_ContEditAfterChgDegTyp }, [ActRemDegTyp ] = { 545,-1,TabUnk,ActSeeDeg , 0, 0, 0,0x200, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,DegTyp_RemoveDegreeType ,DegTyp_ContEditAfterChgDegTyp }, [ActRenDegTyp ] = { 538,-1,TabUnk,ActSeeDeg , 0, 0, 0,0x200, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,DegTyp_RenameDegreeType ,DegTyp_ContEditAfterChgDegTyp }, // Buildings [ActSeeBld ] = {1838, 2,TabCtr,ActSeeBld , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Bld_SeeBuildings }, [ActEdiBld ] = {1839,-1,TabUnk,ActSeeBld , 0, 0, 0,0x3C6, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Bld_EditBuildings }, - [ActNewBld ] = {1840,-1,TabUnk,ActSeeBld , 0, 0, 0,0x3C6, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Bld_ReceiveFormNewBuilding ,Bld_ContEditAfterChgBuilding }, + [ActNewBld ] = {1840,-1,TabUnk,ActSeeBld , 0, 0, 0,0x3C6, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Bld_ReceiveNewBuilding ,Bld_ContEditAfterChgBuilding }, [ActRemBld ] = {1841,-1,TabUnk,ActSeeBld , 0, 0, 0,0x3C6, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Bld_RemoveBuilding ,Bld_ContEditAfterChgBuilding }, [ActRenBldSho ] = {1842,-1,TabUnk,ActSeeBld , 0, 0, 0,0x3C6, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Bld_RenameBuildingShort ,Bld_ContEditAfterChgBuilding }, [ActRenBldFul ] = {1843,-1,TabUnk,ActSeeBld , 0, 0, 0,0x3C6, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Bld_RenameBuildingFull ,Bld_ContEditAfterChgBuilding }, @@ -385,7 +385,7 @@ const struct Act_Actions ActLst_Actions[ActLst_NUM_ACTIONS] = // Rooms [ActSeeRoo ] = {1744, 2,TabCtr,ActSeeRoo , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Roo_SeeRooms }, [ActEdiRoo ] = {1745,-1,TabUnk,ActSeeRoo , 0, 0, 0,0x3C6, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Roo_EditRooms }, - [ActNewRoo ] = {1746,-1,TabUnk,ActSeeRoo , 0, 0, 0,0x3C6, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Roo_ReceiveFormNewRoom ,Roo_ContEditAfterChgRoom }, + [ActNewRoo ] = {1746,-1,TabUnk,ActSeeRoo , 0, 0, 0,0x3C6, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Roo_ReceiveNewRoom ,Roo_ContEditAfterChgRoom }, [ActRemRoo ] = {1747,-1,TabUnk,ActSeeRoo , 0, 0, 0,0x3C6, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Roo_RemoveRoom ,Roo_ContEditAfterChgRoom }, [ActChgRooBld ] = {1845,-1,TabUnk,ActSeeRoo , 0, 0, 0,0x3C6, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Roo_ChangeBuilding ,Roo_ContEditAfterChgRoom }, [ActChgRooFlo ] = {1846,-1,TabUnk,ActSeeRoo , 0, 0, 0,0x3C6, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Roo_ChangeFloor ,Roo_ContEditAfterChgRoom }, @@ -410,8 +410,8 @@ const struct Act_Actions ActLst_Actions[ActLst_NUM_ACTIONS] = // Courses [ActSeeCrs ] = {1009, 1,TabDeg,ActSeeCrs , 0, 0,0x3C7, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Crs_ShowCrssOfCurrentDeg }, [ActEdiCrs ] = { 555,-1,TabUnk,ActSeeCrs , 0, 0,0x3C6, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Crs_EditCourses }, - [ActReqCrs ] = {1053,-1,TabUnk,ActSeeCrs , 0, 0,0x3C6, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Crs_ReceiveFormReqCrs ,Crs_ContEditAfterChgCrs }, - [ActNewCrs ] = { 556,-1,TabUnk,ActSeeCrs , 0, 0,0x3C0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Crs_ReceiveFormNewCrs ,Crs_ContEditAfterChgCrs }, + [ActReqCrs ] = {1053,-1,TabUnk,ActSeeCrs , 0, 0,0x3C6, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Crs_ReceiveReqCrs ,Crs_ContEditAfterChgCrs }, + [ActNewCrs ] = { 556,-1,TabUnk,ActSeeCrs , 0, 0,0x3C0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Crs_ReceiveNewCrs ,Crs_ContEditAfterChgCrs }, [ActRemCrs ] = { 560,-1,TabUnk,ActSeeCrs , 0, 0,0x3C6, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Crs_RemoveCourse ,Crs_ContEditAfterChgCrs }, [ActChgInsCrsCod ] = {1025,-1,TabUnk,ActSeeCrs , 0, 0,0x3C6, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Crs_ChangeInsCrsCod ,Crs_ContEditAfterChgCrs }, [ActChgCrsYea ] = { 561,-1,TabUnk,ActSeeCrs , 0, 0,0x3C6, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Crs_ChangeCrsYear ,Crs_ContEditAfterChgCrs }, @@ -446,8 +446,8 @@ const struct Act_Actions ActLst_Actions[ActLst_NUM_ACTIONS] = [ActSeePrgItm ] = {1927,-1,TabUnk,ActSeePrg ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Prg_ViewItemAfterEdit }, [ActFrmChgPrgItm ] = {1823,-1,TabUnk,ActSeePrg ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Prg_ReqChangeItem }, [ActFrmNewPrgItm ] = {1822,-1,TabUnk,ActSeePrg ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Prg_ReqCreateItem }, - [ActChgPrgItm ] = {1826,-1,TabUnk,ActSeePrg ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Prg_ReceiveFormChgItem }, - [ActNewPrgItm ] = {1825,-1,TabUnk,ActSeePrg ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Prg_ReceiveFormNewItem }, + [ActChgPrgItm ] = {1826,-1,TabUnk,ActSeePrg ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Prg_ReceiveChgItem }, + [ActNewPrgItm ] = {1825,-1,TabUnk,ActSeePrg ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Prg_ReceiveNewItem }, [ActReqRemPrgItm ] = {1827,-1,TabUnk,ActSeePrg ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Prg_ReqRemItem }, [ActRemPrgItm ] = {1828,-1,TabUnk,ActSeePrg ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Prg_RemoveItem }, [ActHidPrgItm ] = {1829,-1,TabUnk,ActSeePrg ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Prg_HideItem }, @@ -580,8 +580,8 @@ const struct Act_Actions ActLst_Actions[ActLst_NUM_ACTIONS] = [ActEdiOneAsg ] = { 814,-1,TabUnk,ActSeeAllAsg ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Asg_ReqCreatOrEditAsg }, [ActSeeOneAsg ] = {1942,-1,TabUnk,ActSeeAllAsg ,0x3F8,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Asg_SeeOneAssignment }, [ActPrnOneAsg ] = {1637,-1,TabUnk,ActSeeAllAsg ,0x3F8,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_NEW_TAB,NULL ,Asg_PrintOneAssignment }, - [ActNewAsg ] = { 803,-1,TabUnk,ActSeeAllAsg ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Asg_ReceiveFormAssignment }, - [ActChgAsg ] = { 815,-1,TabUnk,ActSeeAllAsg ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Asg_ReceiveFormAssignment }, + [ActNewAsg ] = { 803,-1,TabUnk,ActSeeAllAsg ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Asg_ReceiveAssignment }, + [ActChgAsg ] = { 815,-1,TabUnk,ActSeeAllAsg ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Asg_ReceiveAssignment }, [ActReqRemAsg ] = { 813,-1,TabUnk,ActSeeAllAsg ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Asg_ReqRemAssignment }, [ActRemAsg ] = { 806,-1,TabUnk,ActSeeAllAsg ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Asg_RemoveAssignment }, [ActHidAsg ] = { 964,-1,TabUnk,ActSeeAllAsg ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Asg_HideAssignment }, @@ -603,8 +603,8 @@ const struct Act_Actions ActLst_Actions[ActLst_NUM_ACTIONS] = [ActEdiOnePrj ] = {1676,-1,TabUnk,ActSeeAllPrj ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Prj_ReqEditPrj }, [ActSeeOnePrj ] = {1949,-1,TabUnk,ActSeeAllPrj ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Brw_ShowFileBrowserOrWorks }, [ActPrnOnePrj ] = {1677,-1,TabUnk,ActSeeAllPrj ,0x3F8,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_NEW_TAB,NULL ,Prj_PrintOneProject }, - [ActNewPrj ] = {1678,-1,TabUnk,ActSeeAllPrj ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Prj_ReceiveFormProject }, - [ActChgPrj ] = {1679,-1,TabUnk,ActSeeAllPrj ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Prj_ReceiveFormProject }, + [ActNewPrj ] = {1678,-1,TabUnk,ActSeeAllPrj ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Prj_ReceiveProject }, + [ActChgPrj ] = {1679,-1,TabUnk,ActSeeAllPrj ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Prj_ReceiveProject }, [ActReqRemPrj ] = {1680,-1,TabUnk,ActSeeAllPrj ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Prj_ReqRemProject }, [ActRemPrj ] = {1681,-1,TabUnk,ActSeeAllPrj ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Prj_RemoveProject }, [ActHidPrj ] = {1682,-1,TabUnk,ActSeeAllPrj ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Prj_HideProject }, @@ -637,7 +637,7 @@ const struct Act_Actions ActLst_Actions[ActLst_NUM_ACTIONS] = [ActCreFolDocPrj ] = {1705,-1,TabUnk,ActSeeAllPrj ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Brw_RecFolderFileBrowser }, [ActCreLnkDocPrj ] = {1706,-1,TabUnk,ActSeeAllPrj ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Brw_RecLinkFileBrowser }, [ActRenFolDocPrj ] = {1707,-1,TabUnk,ActSeeAllPrj ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Brw_RenFolderFileBrowser }, - [ActRcvFilDocPrjDZ ] = {1708,-1,TabUnk,ActSeeAllPrj ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_DATA,Act_UPL_FIL,Brw_RcvFileInFileBrwDZ,NULL }, + [ActRcvFilDocPrjDZ ] = {1708,-1,TabUnk,ActSeeAllPrj ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_DATA,Act_UPL_FIL,Brw_RcvFileInFileBrwDZ ,NULL }, [ActRcvFilDocPrjCla ] = {1709,-1,TabUnk,ActSeeAllPrj ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_DATA,Act_1ST_TAB,NULL ,Brw_RcvFileInFileBrwClassic }, [ActExpDocPrj ] = {1710,-1,TabUnk,ActSeeAllPrj ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_204_NOC,Brw_ExpandFileTree ,NULL }, [ActConDocPrj ] = {1711,-1,TabUnk,ActSeeAllPrj ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_204_NOC,Brw_ContractFileTree ,NULL }, @@ -656,7 +656,7 @@ const struct Act_Actions ActLst_Actions[ActLst_NUM_ACTIONS] = [ActCreFolAssPrj ] = {1724,-1,TabUnk,ActSeeAllPrj ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Brw_RecFolderFileBrowser }, [ActCreLnkAssPrj ] = {1725,-1,TabUnk,ActSeeAllPrj ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Brw_RecLinkFileBrowser }, [ActRenFolAssPrj ] = {1726,-1,TabUnk,ActSeeAllPrj ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Brw_RenFolderFileBrowser }, - [ActRcvFilAssPrjDZ ] = {1727,-1,TabUnk,ActSeeAllPrj ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_DATA,Act_UPL_FIL,Brw_RcvFileInFileBrwDZ,NULL }, + [ActRcvFilAssPrjDZ ] = {1727,-1,TabUnk,ActSeeAllPrj ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_DATA,Act_UPL_FIL,Brw_RcvFileInFileBrwDZ ,NULL }, [ActRcvFilAssPrjCla ] = {1728,-1,TabUnk,ActSeeAllPrj ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_DATA,Act_1ST_TAB,NULL ,Brw_RcvFileInFileBrwClassic }, [ActExpAssPrj ] = {1729,-1,TabUnk,ActSeeAllPrj ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_204_NOC,Brw_ExpandFileTree ,NULL }, [ActConAssPrj ] = {1730,-1,TabUnk,ActSeeAllPrj ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_204_NOC,Brw_ContractFileTree ,NULL }, @@ -679,7 +679,7 @@ const struct Act_Actions ActLst_Actions[ActLst_NUM_ACTIONS] = [ActReqLnkCfe ] = {1934,-1,TabUnk,ActSeeAllCfe ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,CfeRsc_GetLinkToCallForExam }, // Questions - [ActEdiTstQst ] = { 104, 3,TabAss,ActEdiTstQst ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Dat_SetIniEndDatesToPastAndNow,Qst_ReqEditQsts }, + [ActEdiTstQst ] = { 104, 3,TabAss,ActEdiTstQst ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Dat_SetDatesToPastAndNow ,Qst_ReqEditQsts }, [ActEdiOneTstQst ] = { 105,-1,TabUnk,ActEdiTstQst ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Qst_ShowFormEditOneQst }, [ActReqImpTstQst ] = {1007,-1,TabUnk,ActEdiTstQst ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,QstImp_ShowFormImpQstsFromXML }, [ActImpTstQst ] = {1008,-1,TabUnk,ActEdiTstQst ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_DATA,Act_1ST_TAB,NULL ,QstImp_ImpQstsFromXML }, @@ -703,10 +703,10 @@ const struct Act_Actions ActLst_Actions[ActLst_NUM_ACTIONS] = [ActAssTst ] = { 98,-1,TabUnk,ActReqTst ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Tst_AssessTest }, [ActCfgTst ] = { 451,-1,TabUnk,ActReqTst ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,TstCfg_CheckAndShowFormConfig }, [ActRcvCfgTst ] = { 454,-1,TabUnk,ActReqTst ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,TstCfg_ReceiveConfigTst }, - [ActReqSeeMyTstRes ] = {1083,-1,TabUnk,ActReqTst ,0x208,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Dat_SetIniEndDatesToPastAndNow,TstPrn_SelDatesToSeeMyPrints}, + [ActReqSeeMyTstRes ] = {1083,-1,TabUnk,ActReqTst ,0x208,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Dat_SetDatesToPastAndNow ,TstPrn_SelDatesToSeeMyPrints }, [ActSeeMyTstResCrs ] = {1084,-1,TabUnk,ActReqTst ,0x208,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,TstPrn_ShowMyPrints }, [ActSeeOneTstResMe ] = {1085,-1,TabUnk,ActReqTst ,0x208,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,TstPrn_ShowOnePrint }, - [ActReqSeeUsrTstRes ] = {1080,-1,TabUnk,ActReqTst ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Dat_SetIniEndDatesToPastAndNow,TstPrn_SelUsrsToViewUsrsPrints}, + [ActReqSeeUsrTstRes ] = {1080,-1,TabUnk,ActReqTst ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Dat_SetDatesToPastAndNow ,TstPrn_SelUsrsToViewUsrsPrints}, [ActSeeUsrTstResCrs ] = {1081,-1,TabUnk,ActReqTst ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,TstPrn_GetUsrsAndShowPrints }, [ActSeeOneTstResOth ] = {1082,-1,TabUnk,ActReqTst ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,TstPrn_ShowOnePrint }, @@ -715,21 +715,21 @@ const struct Act_Actions ActLst_Actions[ActLst_NUM_ACTIONS] = [ActSeeOneExa ] = {1849,-1,TabUnk,ActSeeAllExa ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Exa_SeeOneExam }, [ActFrmNewExa ] = {1877,-1,TabUnk,ActSeeAllExa ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Exa_ReqCreatOrEditExam }, [ActEdiOneExa ] = {1878,-1,TabUnk,ActSeeAllExa ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Exa_ReqCreatOrEditExam }, - [ActNewExa ] = {1879,-1,TabUnk,ActSeeAllExa ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Exa_ReceiveFormExam }, - [ActChgExa ] = {1880,-1,TabUnk,ActSeeAllExa ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Exa_ReceiveFormExam }, + [ActNewExa ] = {1879,-1,TabUnk,ActSeeAllExa ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Exa_ReceiveExam }, + [ActChgExa ] = {1880,-1,TabUnk,ActSeeAllExa ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Exa_ReceiveExam }, [ActReqRemExa ] = {1881,-1,TabUnk,ActSeeAllExa ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Exa_AskRemExam }, [ActRemExa ] = {1882,-1,TabUnk,ActSeeAllExa ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Exa_RemoveExam }, [ActHidExa ] = {1883,-1,TabUnk,ActSeeAllExa ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Exa_HideExam }, [ActUnhExa ] = {1884,-1,TabUnk,ActSeeAllExa ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Exa_UnhideExam }, [ActReqLnkExa ] = {1936,-1,TabUnk,ActSeeAllExa ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,ExaRsc_GetLinkToExam }, - [ActNewExaSet ] = {1898,-1,TabUnk,ActSeeAllExa ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,ExaSet_ReceiveFormSet }, + [ActNewExaSet ] = {1898,-1,TabUnk,ActSeeAllExa ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,ExaSet_ReceiveSet }, [ActReqRemExaSet ] = {1893,-1,TabUnk,ActSeeAllExa ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,ExaSet_ReqRemSet }, [ActRemExaSet ] = {1894,-1,TabUnk,ActSeeAllExa ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,ExaSet_RemoveSet }, [ActUp_ExaSet ] = {1895,-1,TabUnk,ActSeeAllExa ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,ExaSet_MoveUpSet }, [ActDwnExaSet ] = {1896,-1,TabUnk,ActSeeAllExa ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,ExaSet_MoveDownSet }, [ActChgTitExaSet ] = {1897,-1,TabUnk,ActSeeAllExa ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,ExaSet_ChangeSetTitle }, [ActChgNumQstExaSet ] = {1899,-1,TabUnk,ActSeeAllExa ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,ExaSet_ChangeNumQstsToExam }, - [ActReqAddQstExaSet ] = {1885,-1,TabUnk,ActSeeAllExa ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Dat_SetIniEndDatesToPastAndNow,ExaSet_ReqSelectQstsToAddToSet}, + [ActReqAddQstExaSet ] = {1885,-1,TabUnk,ActSeeAllExa ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Dat_SetDatesToPastAndNow ,ExaSet_ReqSelectQstsToAddToSet }, [ActLstTstQstForSet ] = {1886,-1,TabUnk,ActSeeAllExa ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,ExaSet_ListQstsToAddToSet }, [ActAddQstToExa ] = {1887,-1,TabUnk,ActSeeAllExa ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,ExaSet_AddQstsToSet }, [ActReqRemSetQst ] = {1888,-1,TabUnk,ActSeeAllExa ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,ExaSet_ReqRemQstFromSet }, @@ -738,8 +738,8 @@ const struct Act_Actions ActLst_Actions[ActLst_NUM_ACTIONS] = [ActInvSetQst ] = {1910,-1,TabUnk,ActSeeAllExa ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,ExaSet_InvalidateQst }, [ActReqNewExaSes ] = {1852,-1,TabUnk,ActSeeAllExa ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,ExaSes_ReqCreatOrEditSes }, [ActReqChgExaSes ] = {1902,-1,TabUnk,ActSeeAllExa ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,ExaSes_ReqCreatOrEditSes }, - [ActNewExaSes ] = {1853,-1,TabUnk,ActSeeAllExa ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,ExaSes_ReceiveFormSession }, - [ActChgExaSes ] = {1903,-1,TabUnk,ActSeeAllExa ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,ExaSes_ReceiveFormSession }, + [ActNewExaSes ] = {1853,-1,TabUnk,ActSeeAllExa ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,ExaSes_ReceiveSession }, + [ActChgExaSes ] = {1903,-1,TabUnk,ActSeeAllExa ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,ExaSes_ReceiveSession }, [ActReqRemExaSes ] = {1850,-1,TabUnk,ActSeeAllExa ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,ExaSes_ReqRemSession }, [ActRemExaSes ] = {1851,-1,TabUnk,ActSeeAllExa ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,ExaSes_RemoveSession }, [ActHidExaSes ] = {1900,-1,TabUnk,ActSeeAllExa ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,ExaSes_HideSession }, @@ -793,13 +793,13 @@ const struct Act_Actions ActLst_Actions[ActLst_NUM_ACTIONS] = [ActLstOneGam ] = {1912,-1,TabUnk,ActSeeAllGam ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Gam_ListGame }, [ActFrmNewGam ] = {1652,-1,TabUnk,ActSeeAllGam ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Gam_ReqCreatOrEditGame }, [ActEdiOneGam ] = {1653,-1,TabUnk,ActSeeAllGam ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Gam_ReqCreatOrEditGame }, - [ActNewGam ] = {1654,-1,TabUnk,ActSeeAllGam ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Gam_ReceiveFormGame }, - [ActChgGam ] = {1655,-1,TabUnk,ActSeeAllGam ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Gam_ReceiveFormGame }, + [ActNewGam ] = {1654,-1,TabUnk,ActSeeAllGam ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Gam_ReceiveGame }, + [ActChgGam ] = {1655,-1,TabUnk,ActSeeAllGam ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Gam_ReceiveGame }, [ActReqRemGam ] = {1656,-1,TabUnk,ActSeeAllGam ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Gam_AskRemGame }, [ActRemGam ] = {1657,-1,TabUnk,ActSeeAllGam ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Gam_RemoveGame }, [ActHidGam ] = {1660,-1,TabUnk,ActSeeAllGam ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Gam_HideGame }, [ActUnhGam ] = {1661,-1,TabUnk,ActSeeAllGam ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Gam_UnhideGame }, - [ActAddOneGamQst ] = {1662,-1,TabUnk,ActSeeAllGam ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Dat_SetIniEndDatesToPastAndNow,Gam_ReqSelectQstsToAddToGame}, + [ActAddOneGamQst ] = {1662,-1,TabUnk,ActSeeAllGam ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Dat_SetDatesToPastAndNow ,Gam_ReqSelectQstsToAddToGame }, [ActGamLstTstQst ] = {1666,-1,TabUnk,ActSeeAllGam ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Gam_ListQstsToAddToGame }, [ActAddTstQstToGam ] = {1667,-1,TabUnk,ActSeeAllGam ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Gam_AddQstsToGame }, [ActReqRemGamQst ] = {1664,-1,TabUnk,ActSeeAllGam ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Gam_ReqRemQstFromGame }, @@ -813,14 +813,14 @@ const struct Act_Actions ActLst_Actions[ActLst_NUM_ACTIONS] = [ActSeeOneRub ] = {1952,-1,TabUnk,ActSeeAllRub ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Rub_SeeOneRubric }, [ActFrmNewRub ] = {1953,-1,TabUnk,ActSeeAllRub ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Rub_ReqCreatOrEditRubric }, [ActEdiOneRub ] = {1954,-1,TabUnk,ActSeeAllRub ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Rub_ReqCreatOrEditRubric }, - [ActNewRub ] = {1955,-1,TabUnk,ActSeeAllRub ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Rub_ReceiveFormRubric }, - [ActChgRub ] = {1956,-1,TabUnk,ActSeeAllRub ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Rub_ReceiveFormRubric }, + [ActNewRub ] = {1955,-1,TabUnk,ActSeeAllRub ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Rub_ReceiveRubric }, + [ActChgRub ] = {1956,-1,TabUnk,ActSeeAllRub ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Rub_ReceiveRubric }, [ActReqRemRub ] = {1957,-1,TabUnk,ActSeeAllRub ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Rub_AskRemRubric }, [ActRemRub ] = {1958,-1,TabUnk,ActSeeAllRub ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Rub_RemoveRubric }, [ActReqLnkRub ] = {1969,-1,TabUnk,ActSeeAllRub ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,RubRsc_GetLinkToRubric }, [ActSeeRscCli_InRub ] = {1972,-1,TabUnk,ActSeeAllRub ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,RubRsc_ViewResourceClipboard }, [ActRemRscCli_InRub ] = {1973,-1,TabUnk,ActSeeAllRub ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,RubRsc_RemoveResourceClipboard }, - [ActNewRubCri ] = {1959,-1,TabUnk,ActSeeAllRub ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,RubCri_ReceiveFormCriterion }, + [ActNewRubCri ] = {1959,-1,TabUnk,ActSeeAllRub ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,RubCri_ReceiveCriterion }, [ActReqRemRubCri ] = {1960,-1,TabUnk,ActSeeAllRub ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,RubCri_ReqRemCriterion }, [ActRemRubCri ] = {1961,-1,TabUnk,ActSeeAllRub ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,RubCri_RemoveCriterion }, [ActUp_RubCri ] = {1962,-1,TabUnk,ActSeeAllRub ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,RubCri_MoveUpCriterion }, @@ -853,7 +853,7 @@ const struct Act_Actions ActLst_Actions[ActLst_NUM_ACTIONS] = [ActCreFolDocIns ] = {1324,-1,TabUnk,ActSeeAdmDocIns , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Brw_RecFolderFileBrowser }, [ActCreLnkDocIns ] = {1325,-1,TabUnk,ActSeeAdmDocIns , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Brw_RecLinkFileBrowser }, [ActRenFolDocIns ] = {1326,-1,TabUnk,ActSeeAdmDocIns , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Brw_RenFolderFileBrowser }, - [ActRcvFilDocInsDZ ] = {1327,-1,TabUnk,ActSeeAdmDocIns , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_DATA,Act_UPL_FIL,Brw_RcvFileInFileBrwDZ,NULL }, + [ActRcvFilDocInsDZ ] = {1327,-1,TabUnk,ActSeeAdmDocIns , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_DATA,Act_UPL_FIL,Brw_RcvFileInFileBrwDZ ,NULL }, [ActRcvFilDocInsCla ] = {1328,-1,TabUnk,ActSeeAdmDocIns , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_DATA,Act_1ST_TAB,NULL ,Brw_RcvFileInFileBrwClassic }, [ActExpAdmDocIns ] = {1329,-1,TabUnk,ActSeeAdmDocIns , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_204_NOC,Brw_ExpandFileTree ,NULL }, [ActConAdmDocIns ] = {1330,-1,TabUnk,ActSeeAdmDocIns , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_204_NOC,Brw_ContractFileTree ,NULL }, @@ -876,7 +876,7 @@ const struct Act_Actions ActLst_Actions[ActLst_NUM_ACTIONS] = [ActCreFolShaIns ] = {1390,-1,TabUnk,ActAdmShaIns , 0, 0, 0, 0,0x3C0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Brw_RecFolderFileBrowser }, [ActCreLnkShaIns ] = {1391,-1,TabUnk,ActAdmShaIns , 0, 0, 0, 0,0x3C0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Brw_RecLinkFileBrowser }, [ActRenFolShaIns ] = {1392,-1,TabUnk,ActAdmShaIns , 0, 0, 0, 0,0x3C0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Brw_RenFolderFileBrowser }, - [ActRcvFilShaInsDZ ] = {1393,-1,TabUnk,ActAdmShaIns , 0, 0, 0, 0,0x3C0, 0, 0,Act_CONT_DATA,Act_UPL_FIL,Brw_RcvFileInFileBrwDZ,NULL }, + [ActRcvFilShaInsDZ ] = {1393,-1,TabUnk,ActAdmShaIns , 0, 0, 0, 0,0x3C0, 0, 0,Act_CONT_DATA,Act_UPL_FIL,Brw_RcvFileInFileBrwDZ ,NULL }, [ActRcvFilShaInsCla ] = {1394,-1,TabUnk,ActAdmShaIns , 0, 0, 0, 0,0x3C0, 0, 0,Act_CONT_DATA,Act_1ST_TAB,NULL ,Brw_RcvFileInFileBrwClassic }, [ActExpShaIns ] = {1395,-1,TabUnk,ActAdmShaIns , 0, 0, 0, 0,0x3C0, 0, 0,Act_CONT_NORM,Act_204_NOC,Brw_ExpandFileTree ,NULL }, [ActConShaIns ] = {1396,-1,TabUnk,ActAdmShaIns , 0, 0, 0, 0,0x3C0, 0, 0,Act_CONT_NORM,Act_204_NOC,Brw_ContractFileTree ,NULL }, @@ -906,7 +906,7 @@ const struct Act_Actions ActLst_Actions[ActLst_NUM_ACTIONS] = [ActCreFolDocCtr ] = {1295,-1,TabUnk,ActSeeAdmDocCtr , 0, 0, 0,0x380, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Brw_RecFolderFileBrowser }, [ActCreLnkDocCtr ] = {1296,-1,TabUnk,ActSeeAdmDocCtr , 0, 0, 0,0x380, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Brw_RecLinkFileBrowser }, [ActRenFolDocCtr ] = {1297,-1,TabUnk,ActSeeAdmDocCtr , 0, 0, 0,0x380, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Brw_RenFolderFileBrowser }, - [ActRcvFilDocCtrDZ ] = {1298,-1,TabUnk,ActSeeAdmDocCtr , 0, 0, 0,0x380, 0, 0, 0,Act_CONT_DATA,Act_UPL_FIL,Brw_RcvFileInFileBrwDZ,NULL }, + [ActRcvFilDocCtrDZ ] = {1298,-1,TabUnk,ActSeeAdmDocCtr , 0, 0, 0,0x380, 0, 0, 0,Act_CONT_DATA,Act_UPL_FIL,Brw_RcvFileInFileBrwDZ ,NULL }, [ActRcvFilDocCtrCla ] = {1299,-1,TabUnk,ActSeeAdmDocCtr , 0, 0, 0,0x380, 0, 0, 0,Act_CONT_DATA,Act_1ST_TAB,NULL ,Brw_RcvFileInFileBrwClassic }, [ActExpAdmDocCtr ] = {1300,-1,TabUnk,ActSeeAdmDocCtr , 0, 0, 0,0x380, 0, 0, 0,Act_CONT_NORM,Act_204_NOC,Brw_ExpandFileTree ,NULL }, [ActConAdmDocCtr ] = {1301,-1,TabUnk,ActSeeAdmDocCtr , 0, 0, 0,0x380, 0, 0, 0,Act_CONT_NORM,Act_204_NOC,Brw_ContractFileTree ,NULL }, @@ -929,7 +929,7 @@ const struct Act_Actions ActLst_Actions[ActLst_NUM_ACTIONS] = [ActCreFolShaCtr ] = {1371,-1,TabUnk,ActAdmShaCtr , 0, 0, 0,0x3C0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Brw_RecFolderFileBrowser }, [ActCreLnkShaCtr ] = {1372,-1,TabUnk,ActAdmShaCtr , 0, 0, 0,0x3C0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Brw_RecLinkFileBrowser }, [ActRenFolShaCtr ] = {1373,-1,TabUnk,ActAdmShaCtr , 0, 0, 0,0x3C0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Brw_RenFolderFileBrowser }, - [ActRcvFilShaCtrDZ ] = {1374,-1,TabUnk,ActAdmShaCtr , 0, 0, 0,0x3C0, 0, 0, 0,Act_CONT_DATA,Act_UPL_FIL,Brw_RcvFileInFileBrwDZ,NULL }, + [ActRcvFilShaCtrDZ ] = {1374,-1,TabUnk,ActAdmShaCtr , 0, 0, 0,0x3C0, 0, 0, 0,Act_CONT_DATA,Act_UPL_FIL,Brw_RcvFileInFileBrwDZ ,NULL }, [ActRcvFilShaCtrCla ] = {1375,-1,TabUnk,ActAdmShaCtr , 0, 0, 0,0x3C0, 0, 0, 0,Act_CONT_DATA,Act_1ST_TAB,NULL ,Brw_RcvFileInFileBrwClassic }, [ActExpShaCtr ] = {1376,-1,TabUnk,ActAdmShaCtr , 0, 0, 0,0x3C0, 0, 0, 0,Act_CONT_NORM,Act_204_NOC,Brw_ExpandFileTree ,NULL }, [ActConShaCtr ] = {1377,-1,TabUnk,ActAdmShaCtr , 0, 0, 0,0x3C0, 0, 0, 0,Act_CONT_NORM,Act_204_NOC,Brw_ContractFileTree ,NULL }, @@ -959,7 +959,7 @@ const struct Act_Actions ActLst_Actions[ActLst_NUM_ACTIONS] = [ActCreFolDocDeg ] = {1266,-1,TabUnk,ActSeeAdmDocDeg , 0, 0,0x3C0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Brw_RecFolderFileBrowser }, [ActCreLnkDocDeg ] = {1267,-1,TabUnk,ActSeeAdmDocDeg , 0, 0,0x3C0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Brw_RecLinkFileBrowser }, [ActRenFolDocDeg ] = {1268,-1,TabUnk,ActSeeAdmDocDeg , 0, 0,0x3C0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Brw_RenFolderFileBrowser }, - [ActRcvFilDocDegDZ ] = {1269,-1,TabUnk,ActSeeAdmDocDeg , 0, 0,0x3C0, 0, 0, 0, 0,Act_CONT_DATA,Act_UPL_FIL,Brw_RcvFileInFileBrwDZ,NULL }, + [ActRcvFilDocDegDZ ] = {1269,-1,TabUnk,ActSeeAdmDocDeg , 0, 0,0x3C0, 0, 0, 0, 0,Act_CONT_DATA,Act_UPL_FIL,Brw_RcvFileInFileBrwDZ ,NULL }, [ActRcvFilDocDegCla ] = {1270,-1,TabUnk,ActSeeAdmDocDeg , 0, 0,0x3C0, 0, 0, 0, 0,Act_CONT_DATA,Act_1ST_TAB,NULL ,Brw_RcvFileInFileBrwClassic }, [ActExpAdmDocDeg ] = {1271,-1,TabUnk,ActSeeAdmDocDeg , 0, 0,0x3C0, 0, 0, 0, 0,Act_CONT_NORM,Act_204_NOC,Brw_ExpandFileTree ,NULL }, [ActConAdmDocDeg ] = {1272,-1,TabUnk,ActSeeAdmDocDeg , 0, 0,0x3C0, 0, 0, 0, 0,Act_CONT_NORM,Act_204_NOC,Brw_ContractFileTree ,NULL }, @@ -982,7 +982,7 @@ const struct Act_Actions ActLst_Actions[ActLst_NUM_ACTIONS] = [ActCreFolShaDeg ] = {1352,-1,TabUnk,ActAdmShaDeg , 0, 0,0x3C0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Brw_RecFolderFileBrowser }, [ActCreLnkShaDeg ] = {1353,-1,TabUnk,ActAdmShaDeg , 0, 0,0x3C0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Brw_RecLinkFileBrowser }, [ActRenFolShaDeg ] = {1354,-1,TabUnk,ActAdmShaDeg , 0, 0,0x3C0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Brw_RenFolderFileBrowser }, - [ActRcvFilShaDegDZ ] = {1355,-1,TabUnk,ActAdmShaDeg , 0, 0,0x3C0, 0, 0, 0, 0,Act_CONT_DATA,Act_UPL_FIL,Brw_RcvFileInFileBrwDZ,NULL }, + [ActRcvFilShaDegDZ ] = {1355,-1,TabUnk,ActAdmShaDeg , 0, 0,0x3C0, 0, 0, 0, 0,Act_CONT_DATA,Act_UPL_FIL,Brw_RcvFileInFileBrwDZ ,NULL }, [ActRcvFilShaDegCla ] = {1356,-1,TabUnk,ActAdmShaDeg , 0, 0,0x3C0, 0, 0, 0, 0,Act_CONT_DATA,Act_1ST_TAB,NULL ,Brw_RcvFileInFileBrwClassic }, [ActExpShaDeg ] = {1357,-1,TabUnk,ActAdmShaDeg , 0, 0,0x3C0, 0, 0, 0, 0,Act_CONT_NORM,Act_204_NOC,Brw_ExpandFileTree ,NULL }, [ActConShaDeg ] = {1358,-1,TabUnk,ActAdmShaDeg , 0, 0,0x3C0, 0, 0, 0, 0,Act_CONT_NORM,Act_204_NOC,Brw_ContractFileTree ,NULL }, @@ -1304,14 +1304,14 @@ const struct Act_Actions ActLst_Actions[ActLst_NUM_ACTIONS] = [ActReqSelGrp ] = { 116, 0,TabUsr,ActReqSelGrp ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Grp_ReqRegisterInGrps }, [ActChgGrp ] = { 118,-1,TabUnk,ActReqSelGrp ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Grp_ChangeMyGrpsAndShowChanges }, [ActReqEdiGrp ] = { 108,-1,TabUnk,ActReqSelGrp ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Grp_ReqEditGroups }, - [ActNewGrpTyp ] = { 174,-1,TabUnk,ActReqSelGrp ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Grp_ReceiveFormNewGrpTyp }, + [ActNewGrpTyp ] = { 174,-1,TabUnk,ActReqSelGrp ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Grp_ReceiveNewGrpTyp }, [ActReqRemGrpTyp ] = { 236,-1,TabUnk,ActReqSelGrp ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Grp_ReqRemGroupType }, [ActRemGrpTyp ] = { 237,-1,TabUnk,ActReqSelGrp ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Grp_RemoveGroupType }, [ActRenGrpTyp ] = { 304,-1,TabUnk,ActReqSelGrp ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Grp_RenameGroupType }, [ActChgMdtGrpTyp ] = { 303,-1,TabUnk,ActReqSelGrp ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Grp_ChangeMandatGrpTyp }, [ActChgMulGrpTyp ] = { 302,-1,TabUnk,ActReqSelGrp ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Grp_ChangeMultiGrpTyp }, [ActChgTimGrpTyp ] = {1061,-1,TabUnk,ActReqSelGrp ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Grp_ChangeOpenTimeGrpTyp }, - [ActNewGrp ] = { 122,-1,TabUnk,ActReqSelGrp ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Grp_ReceiveFormNewGrp }, + [ActNewGrp ] = { 122,-1,TabUnk,ActReqSelGrp ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Grp_ReceiveNewGrp }, [ActReqRemGrp ] = { 107,-1,TabUnk,ActReqSelGrp ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Grp_ReqRemGroup }, [ActRemGrp ] = { 175,-1,TabUnk,ActReqSelGrp ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Grp_RemoveGroup }, [ActOpeGrp ] = { 322,-1,TabUnk,ActReqSelGrp ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Grp_OpenGroup }, @@ -1360,10 +1360,10 @@ const struct Act_Actions ActLst_Actions[ActLst_NUM_ACTIONS] = [ActUnfSevStd ] = {1762,-1,TabUnk,ActLstStd ,0x3F8,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Fol_UnfollowUsrs }, [ActSeeRecOneStd ] = {1174,-1,TabUnk,ActLstStd ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Rec_GetUsrAndShowRecOneStdCrs }, [ActReqEnrSevStd ] = {1426,-1,TabUnk,ActLstStd ,0x3E0,0x3C0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Enr_ReqAdminStds }, - [ActRcvFrmEnrSevStd ] = {1428,-1,TabUnk,ActLstStd ,0x3E0,0x3C0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Enr_ReceiveFormAdminStds }, + [ActRcvFrmEnrSevStd ] = {1428,-1,TabUnk,ActLstStd ,0x3E0,0x3C0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Enr_ReceiveAdminStds }, [ActRcvRecOthUsr ] = { 300,-1,TabUnk,ActLstStd ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Rec_UpdateAndShowOtherCrsRecord}, [ActEdiRecFie ] = { 292,-1,TabUnk,ActLstStd ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Rec_ReqEditRecordFields }, - [ActNewFie ] = { 293,-1,TabUnk,ActLstStd ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Rec_ReceiveFormField }, + [ActNewFie ] = { 293,-1,TabUnk,ActLstStd ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Rec_ReceiveField }, [ActReqRemFie ] = { 294,-1,TabUnk,ActLstStd ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Rec_ReqRemField }, [ActRemFie ] = { 295,-1,TabUnk,ActLstStd ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Rec_RemoveField }, [ActRenFie ] = { 296,-1,TabUnk,ActLstStd ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Rec_RenameField }, @@ -1414,9 +1414,9 @@ const struct Act_Actions ActLst_Actions[ActLst_NUM_ACTIONS] = [ActSeeRecOneTch ] = {1175,-1,TabUnk,ActLstTch ,0x3F8,0x3C0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Rec_GetUsrAndShowRecOneTchCrs }, [ActReqEnrSevNET ] = {1642,-1,TabUnk,ActLstTch ,0x3C0,0x3C0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Enr_ReqAdminNonEditingTchs }, - [ActRcvFrmEnrSevNET ] = {1643,-1,TabUnk,ActLstTch ,0x3C0,0x3C0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Enr_ReceiveFormAdminNonEditTchs}, + [ActRcvFrmEnrSevNET ] = {1643,-1,TabUnk,ActLstTch ,0x3C0,0x3C0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Enr_ReceiveAdminNonEditTchs }, [ActReqEnrSevTch ] = {1427,-1,TabUnk,ActLstTch ,0x3C0,0x3C0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Enr_ReqAdminTchs }, - [ActRcvFrmEnrSevTch ] = {1429,-1,TabUnk,ActLstTch ,0x3C0,0x3C0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Enr_ReceiveFormAdminTchs }, + [ActRcvFrmEnrSevTch ] = {1429,-1,TabUnk,ActLstTch ,0x3C0,0x3C0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Enr_ReceiveAdminTchs }, [ActFrmLogInUsrAgd ] = {1614,-1,TabUnk,ActLstTch , 0,0x001,0x001,0x001,0x001,0x001,0x001,Act_CONT_NORM,Act_1ST_TAB,NULL ,Agd_PutFormLogInToShowUsrAgenda}, [ActLogInUsrAgd ] = {1615,-1,TabUnk,ActLstTch ,0x3F8,0x3C4,0x3C4,0x3C4,0x3C4,0x3C4,0x3C4,Act_CONT_NORM,Act_1ST_TAB,NULL ,Agd_ShowOtherAgendaAfterLogIn }, [ActLogInUsrAgdLan ] = {1616,-1,TabUnk,ActLstTch ,0x3F8,0x3C4,0x3C4,0x3C4,0x3C4,0x3C4,0x3C4,Act_CONT_NORM,Act_1ST_TAB,NULL ,Agd_ShowOtherAgendaAfterLogIn }, @@ -1469,8 +1469,8 @@ const struct Act_Actions ActLst_Actions[ActLst_NUM_ACTIONS] = [ActPrnLstUsrAtt ] = {1075,-1,TabUnk,ActSeeAllAtt ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_NEW_TAB,NULL ,Att_PrintUsrsAttendanceCrs }, [ActFrmNewAtt ] = {1063,-1,TabUnk,ActSeeAllAtt ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Att_ReqCreatOrEditEvent }, [ActEdiOneAtt ] = {1064,-1,TabUnk,ActSeeAllAtt ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Att_ReqCreatOrEditEvent }, - [ActNewAtt ] = {1065,-1,TabUnk,ActSeeAllAtt ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Att_ReceiveFormEvent }, - [ActChgAtt ] = {1066,-1,TabUnk,ActSeeAllAtt ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Att_ReceiveFormEvent }, + [ActNewAtt ] = {1065,-1,TabUnk,ActSeeAllAtt ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Att_ReceiveEvent }, + [ActChgAtt ] = {1066,-1,TabUnk,ActSeeAllAtt ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Att_ReceiveEvent }, [ActReqRemAtt ] = {1067,-1,TabUnk,ActSeeAllAtt ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Att_AskRemEvent }, [ActRemAtt ] = {1068,-1,TabUnk,ActSeeAllAtt ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Att_GetAndRemEvent }, [ActHidAtt ] = {1069,-1,TabUnk,ActSeeAllAtt ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Att_HideEvent }, @@ -1498,8 +1498,8 @@ const struct Act_Actions ActLst_Actions[ActLst_NUM_ACTIONS] = [ActSeeAnn ] = {1235, 0,TabMsg,ActSeeAnn ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_1ST_TAB,NULL ,Ann_ShowAllAnnouncements }, [ActWriAnn ] = {1237,-1,TabUnk,ActSeeAnn ,0x200,0x200,0x200,0x200,0x200,0x200,0x200,Act_CONT_NORM,Act_1ST_TAB,NULL ,Ann_ShowFormAnnouncement }, [ActNewAnn ] = {1238,-1,TabUnk,ActSeeAnn ,0x200,0x200,0x200,0x200,0x200,0x200,0x200,Act_CONT_NORM,Act_1ST_TAB,NULL ,Ann_ReceiveAnnouncement }, - [ActHidAnn ] = {1470,-1,TabUnk,ActSeeAnn ,0x200,0x200,0x200,0x200,0x200,0x200,0x200,Act_CONT_NORM,Act_1ST_TAB,Ann_HideActiveAnnouncement ,Ann_ShowAllAnnouncements }, - [ActUnhAnn ] = {1471,-1,TabUnk,ActSeeAnn ,0x200,0x200,0x200,0x200,0x200,0x200,0x200,Act_CONT_NORM,Act_1ST_TAB,Ann_RevealHiddenAnnouncement,Ann_ShowAllAnnouncements }, + [ActHidAnn ] = {1470,-1,TabUnk,ActSeeAnn ,0x200,0x200,0x200,0x200,0x200,0x200,0x200,Act_CONT_NORM,Act_1ST_TAB,Ann_HideAnnouncement ,Ann_ShowAllAnnouncements }, + [ActUnhAnn ] = {1471,-1,TabUnk,ActSeeAnn ,0x200,0x200,0x200,0x200,0x200,0x200,0x200,Act_CONT_NORM,Act_1ST_TAB,Ann_UnhideAnnouncement ,Ann_ShowAllAnnouncements }, [ActRemAnn ] = {1236,-1,TabUnk,ActSeeAnn ,0x200,0x200,0x200,0x200,0x200,0x200,0x200,Act_CONT_NORM,Act_1ST_TAB,NULL ,Ann_RemoveAnnouncement }, // Notices @@ -1507,8 +1507,8 @@ const struct Act_Actions ActLst_Actions[ActLst_NUM_ACTIONS] = [ActSeeOneNot ] = {1164,-1,TabUnk,ActSeeAllNot ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Not_GetHighLightedNotCod ,Not_ListFullNotices }, [ActWriNot ] = { 59,-1,TabUnk,ActSeeAllNot ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Not_ShowFormNotice }, [ActNewNot ] = { 60,-1,TabUnk,ActSeeAllNot ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Not_ReceiveNotice ,Not_ListFullNotices }, - [ActHidNot ] = { 763,-1,TabUnk,ActSeeAllNot ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Not_HideActiveNotice ,Not_ListFullNotices }, - [ActUnhNot ] = { 764,-1,TabUnk,ActSeeAllNot ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Not_RevealHiddenNotice ,Not_ListFullNotices }, + [ActHidNot ] = { 763,-1,TabUnk,ActSeeAllNot ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Not_HideNotice ,Not_ListFullNotices }, + [ActUnhNot ] = { 764,-1,TabUnk,ActSeeAllNot ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Not_UnhideNotice ,Not_ListFullNotices }, [ActReqRemNot ] = {1472,-1,TabUnk,ActSeeAllNot ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Not_ReqRemNotice }, [ActRemNot ] = { 73,-1,TabUnk,ActSeeAllNot ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Not_RemoveNotice ,Not_ListNoticesAfterRemoval }, @@ -1698,8 +1698,8 @@ const struct Act_Actions ActLst_Actions[ActLst_NUM_ACTIONS] = [ActAnsSvy ] = { 983,-1,TabUnk,ActSeeAllSvy ,0x3F8,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Svy_ReceiveSurveyAnswers }, [ActFrmNewSvy ] = { 973,-1,TabUnk,ActSeeAllSvy ,0x3E0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Svy_ReqCreatOrEditSvy }, [ActEdiOneSvy ] = { 974,-1,TabUnk,ActSeeAllSvy ,0x3E0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Svy_ReqCreatOrEditSvy }, - [ActNewSvy ] = { 968,-1,TabUnk,ActSeeAllSvy ,0x3E0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Svy_ReceiveFormSurvey }, - [ActChgSvy ] = { 975,-1,TabUnk,ActSeeAllSvy ,0x3E0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Svy_ReceiveFormSurvey }, + [ActNewSvy ] = { 968,-1,TabUnk,ActSeeAllSvy ,0x3E0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Svy_ReceiveSurvey }, + [ActChgSvy ] = { 975,-1,TabUnk,ActSeeAllSvy ,0x3E0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Svy_ReceiveSurvey }, [ActReqRemSvy ] = { 976,-1,TabUnk,ActSeeAllSvy ,0x3E0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Svy_AskRemSurvey }, [ActRemSvy ] = { 969,-1,TabUnk,ActSeeAllSvy ,0x3E0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Svy_RemoveSurvey }, [ActReqRstSvy ] = { 984,-1,TabUnk,ActSeeAllSvy ,0x3E0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Svy_AskResetSurvey }, @@ -1714,9 +1714,9 @@ const struct Act_Actions ActLst_Actions[ActLst_NUM_ACTIONS] = [ActRemSvyQst ] = { 981,-1,TabUnk,ActSeeAllSvy ,0x3E0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Svy_RemoveQst }, // Visits - [ActReqAccGbl ] = { 591, 4,TabAna,ActReqAccGbl ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_1ST_TAB,Dat_SetIniEndDatesToRecentWeeks,Sta_AskShowGblHits }, + [ActReqAccGbl ] = { 591, 4,TabAna,ActReqAccGbl ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_1ST_TAB,Dat_SetDatesToRecentWeeks ,Sta_AskShowGblHits }, [ActSeeAccGbl ] = { 79,-1,TabUnk,ActReqAccGbl ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_1ST_TAB,NULL ,Sta_SeeGblAccesses }, - [ActReqAccCrs ] = { 594,-1,TabUnk,ActReqAccGbl ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Dat_SetIniEndDatesToRecentWeeks,Sta_ReqCrsHits }, + [ActReqAccCrs ] = { 594,-1,TabUnk,ActReqAccGbl ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,Dat_SetDatesToRecentWeeks ,Sta_ReqCrsHits }, [ActSeeAccCrs ] = { 119,-1,TabUnk,ActReqAccGbl ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_1ST_TAB,NULL ,Sta_SeeCrsAccesses }, [ActLstClk ] = { 989,-1,TabUnk,ActReqAccGbl ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_1ST_TAB,NULL ,Log_ShowLastClicks }, [ActRefLstClk ] = { 994,-1,TabUnk,ActReqAccGbl ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_AJAX_RF,NULL ,Lay_RefreshLastClicks }, @@ -1747,8 +1747,8 @@ const struct Act_Actions ActLst_Actions[ActLst_NUM_ACTIONS] = [ActSeeMyAgd ] = {1602, 3,TabPrf,ActSeeMyAgd ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_1ST_TAB,NULL ,Agd_GetParsAndShowMyAgenda }, [ActFrmNewEvtMyAgd ] = {1603,-1,TabUnk,ActSeeMyAgd ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_1ST_TAB,NULL ,Agd_ReqCreatOrEditEvent }, [ActEdiOneEvtMyAgd ] = {1604,-1,TabUnk,ActSeeMyAgd ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_1ST_TAB,NULL ,Agd_ReqCreatOrEditEvent }, - [ActNewEvtMyAgd ] = {1605,-1,TabUnk,ActSeeMyAgd ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_1ST_TAB,NULL ,Agd_ReceiveFormEvent }, - [ActChgEvtMyAgd ] = {1606,-1,TabUnk,ActSeeMyAgd ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_1ST_TAB,NULL ,Agd_ReceiveFormEvent }, + [ActNewEvtMyAgd ] = {1605,-1,TabUnk,ActSeeMyAgd ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_1ST_TAB,NULL ,Agd_ReceiveEvent }, + [ActChgEvtMyAgd ] = {1606,-1,TabUnk,ActSeeMyAgd ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_1ST_TAB,NULL ,Agd_ReceiveEvent }, [ActReqRemEvtMyAgd ] = {1607,-1,TabUnk,ActSeeMyAgd ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_1ST_TAB,NULL ,Agd_AskRemEvent }, [ActRemEvtMyAgd ] = {1608,-1,TabUnk,ActSeeMyAgd ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_1ST_TAB,NULL ,Agd_RemoveEvent }, [ActHidEvtMyAgd ] = {1612,-1,TabUnk,ActSeeMyAgd ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_1ST_TAB,NULL ,Agd_HideEvent }, @@ -2022,7 +2022,7 @@ Act_Action_t ActLst_FromActCodToAction[1 + ActLst_MAX_ACTION_COD] = // Do not re ActRenFolWrkCrs, // #208 ActRemFilWrkCrs, // #209 ActRemFolWrkCrs, // #210 - ActModIteSyl, // #211 + ActModIteSyl, // #211 ActUnk, // #212 (obsolete action) ActUnk, // #213 (obsolete action) ActUnk, // #214 (obsolete action) diff --git a/swad_admin.c b/swad_admin.c index 9fcca28d..26e89e16 100644 --- a/swad_admin.c +++ b/swad_admin.c @@ -75,7 +75,7 @@ void Adm_ReqAddAdm (Hie_Level_t Level) extern const char *Txt_THE_USER_X_is_already_an_administrator_of_Y; extern const char *Txt_Do_you_really_want_to_register_the_following_user_as_an_administrator_of_X; extern const char *Txt_Register_user_IN_A_COURSE_OR_DEGREE; - static const Act_Action_t Enr_ActNewAdm[Hie_NUM_LEVELS] = + static Act_Action_t Enr_ActNewAdm[Hie_NUM_LEVELS] = { [Hie_UNK] = ActUnk, [Hie_SYS] = ActUnk, @@ -344,7 +344,7 @@ static void Adm_AskIfRemAdm (Usr_MeOrOther_t MeOrOther,Hie_Level_t Level) extern const char *Txt_Do_you_really_want_to_remove_the_following_user_as_an_administrator_of_X; extern const char *Txt_Remove_me_as_an_administrator; extern const char *Txt_Remove_USER_as_an_administrator; - static const Act_Action_t ActRemAdm[Hie_NUM_LEVELS] = + static Act_Action_t ActRemAdm[Hie_NUM_LEVELS] = { [Hie_UNK] = ActUnk, [Hie_SYS] = ActUnk, diff --git a/swad_agenda.c b/swad_agenda.c index 6e57bce3..e566e24c 100644 --- a/swad_agenda.c +++ b/swad_agenda.c @@ -423,7 +423,7 @@ void Agd_ShowUsrAgenda (void) void Agd_ShowOtherAgendaAfterLogIn (void) { extern const char *Hlp_PROFILE_Agenda_public_agenda; - extern const unsigned Txt_Current_CGI_SWAD_Language; + extern unsigned Txt_Current_CGI_SWAD_Language; extern const char *Txt_Public_agenda_USER; extern const char *Txt_Switching_to_LANGUAGE[1 + Lan_NUM_LANGUAGES]; struct Agd_Agenda Agenda; @@ -855,7 +855,7 @@ static void Agd_PutFormsToRemEditOneEvent (struct Agd_Agenda *Agenda, struct Agd_Event *AgdEvent, const char *Anchor) { - static const Act_Action_t ActionHideUnhide[HidVis_NUM_HIDDEN_VISIBLE] = + static Act_Action_t ActionHideUnhide[HidVis_NUM_HIDDEN_VISIBLE] = { [HidVis_HIDDEN ] = ActUnhEvtMyAgd, // Hidden ==> action to unhide [HidVis_VISIBLE] = ActHidEvtMyAgd, // Visible ==> action to hide @@ -1449,7 +1449,7 @@ void Agd_ReqCreatOrEditEvent (void) /********************* Receive form to create a new event ********************/ /*****************************************************************************/ -void Agd_ReceiveFormEvent (void) +void Agd_ReceiveEvent (void) { extern const char *Txt_Created_new_event_X; extern const char *Txt_The_event_has_been_modified; diff --git a/swad_agenda.h b/swad_agenda.h index 447d180b..3fcdd7b2 100644 --- a/swad_agenda.h +++ b/swad_agenda.h @@ -127,7 +127,7 @@ void Agd_UnhideEvent (void); void Agd_MakeEventPrivate (void); void Agd_MakeEventPublic (void); -void Agd_ReceiveFormEvent (void); +void Agd_ReceiveEvent (void); void Agd_PrintAgdQRCode (void); diff --git a/swad_announcement.c b/swad_announcement.c index b7604742..170e66cf 100644 --- a/swad_announcement.c +++ b/swad_announcement.c @@ -234,7 +234,7 @@ static void Ann_DrawAnAnnouncement (struct Ann_Announcement *Announcement, [Ann_ACTIVE_ANNOUNCEMENT ] = "NOTICE_BOX NOTICE_BOX_WIDE", [Ann_OBSOLETE_ANNOUNCEMENT] = "NOTICE_BOX NOTICE_BOX_WIDE LIGHT", }; - static const Act_Action_t ActionHideUnhide[HidVis_NUM_HIDDEN_VISIBLE] = + static Act_Action_t ActionHideUnhide[HidVis_NUM_HIDDEN_VISIBLE] = { [HidVis_HIDDEN ] = ActUnhAnn, // Hidden ==> action to unhide [HidVis_VISIBLE] = ActHidAnn, // Visible ==> action to hide @@ -429,7 +429,7 @@ void Ann_ReceiveAnnouncement (void) /*********** Mark as hidden a global announcement that was active ************/ /*****************************************************************************/ -void Ann_HideActiveAnnouncement (void) +void Ann_HideAnnouncement (void) { long AnnCod; @@ -444,7 +444,7 @@ void Ann_HideActiveAnnouncement (void) /*********** Mark as active a global announcement that was hidden ************/ /*****************************************************************************/ -void Ann_RevealHiddenAnnouncement (void) +void Ann_UnhideAnnouncement (void) { long AnnCod; diff --git a/swad_announcement.h b/swad_announcement.h index cd24e29b..a27ba8c4 100644 --- a/swad_announcement.h +++ b/swad_announcement.h @@ -58,8 +58,8 @@ void Ann_ShowMyAnnouncementsNotMarkedAsSeen (void); void Ann_ShowFormAnnouncement (void); void Ann_ReceiveAnnouncement (void); -void Ann_HideActiveAnnouncement (void); -void Ann_RevealHiddenAnnouncement (void); +void Ann_HideAnnouncement (void); +void Ann_UnhideAnnouncement (void); void Ann_RemoveAnnouncement (void); void Ann_MarkAnnouncementAsSeen (void); diff --git a/swad_assignment.c b/swad_assignment.c index 29b447cb..091a56d7 100644 --- a/swad_assignment.c +++ b/swad_assignment.c @@ -744,7 +744,7 @@ Dat_StartEndTime_t Asg_GetParAsgOrder (void) static void Asg_PutIconsToRemEditOneAsg (struct Asg_Assignments *Assignments, const char *Anchor) { - static const Act_Action_t ActionHideUnhide[HidVis_NUM_HIDDEN_VISIBLE] = + static Act_Action_t ActionHideUnhide[HidVis_NUM_HIDDEN_VISIBLE] = { [HidVis_HIDDEN ] = ActUnhAsg, // Hidden ==> action to unhide [HidVis_VISIBLE] = ActHidAsg, // Visible ==> action to hide @@ -1357,7 +1357,7 @@ static void Asg_ShowLstGrpsToEditAssignment (long AsgCod) /****************** Receive form to create a new assignment ******************/ /*****************************************************************************/ -void Asg_ReceiveFormAssignment (void) +void Asg_ReceiveAssignment (void) { extern const char *Txt_Already_existed_an_assignment_with_the_title_X; extern const char *Txt_Already_existed_an_assignment_with_the_folder_X; diff --git a/swad_assignment.h b/swad_assignment.h index fb756535..82968f8e 100644 --- a/swad_assignment.h +++ b/swad_assignment.h @@ -102,7 +102,7 @@ void Asg_ReqRemAssignment (void); void Asg_RemoveAssignment (void); void Asg_HideAssignment (void); void Asg_UnhideAssignment (void); -void Asg_ReceiveFormAssignment (void); +void Asg_ReceiveAssignment (void); void Asg_RemoveCrsAssignments (long CrsCod); void Asg_WriteDatesAssignment (const struct Asg_Assignment *Asg); diff --git a/swad_attendance.c b/swad_attendance.c index ffd54a8f..f4437ccb 100644 --- a/swad_attendance.c +++ b/swad_attendance.c @@ -573,7 +573,7 @@ static Dat_StartEndTime_t Att_GetParAttOrder (void) static void Att_PutFormsToRemEditOneEvent (struct Att_Events *Events, const char *Anchor) { - static const Act_Action_t ActionHideUnhide[HidVis_NUM_HIDDEN_VISIBLE] = + static Act_Action_t ActionHideUnhide[HidVis_NUM_HIDDEN_VISIBLE] = { [HidVis_HIDDEN ] = ActUnhAtt, // Hidden ==> action to unhide [HidVis_VISIBLE] = ActHidAtt, // Visible ==> action to hide @@ -1132,7 +1132,7 @@ static void Att_ShowLstGrpsToEditEvent (long AttCod) /*************** Receive form to create a new attendance event ***************/ /*****************************************************************************/ -void Att_ReceiveFormEvent (void) +void Att_ReceiveEvent (void) { extern const char *Txt_Already_existed_an_event_with_the_title_X; extern const char *Txt_Created_new_event_X; diff --git a/swad_attendance.h b/swad_attendance.h index 03777930..92e9f7a9 100644 --- a/swad_attendance.h +++ b/swad_attendance.h @@ -97,7 +97,7 @@ void Att_RemoveEventFromDB (long AttCod); void Att_HideEvent (void); void Att_UnhideEvent (void); -void Att_ReceiveFormEvent (void); +void Att_ReceiveEvent (void); void Att_CreateEvent (struct Att_Event *Event,const char *Description); void Att_UpdateEvent (struct Att_Event *Event,const char *Description); diff --git a/swad_banner.c b/swad_banner.c index 5ca7f685..d03d868d 100644 --- a/swad_banner.c +++ b/swad_banner.c @@ -382,12 +382,12 @@ void Ban_PutIconToViewBanners (void) static void Ban_ListBannersForEdition (struct Ban_Banners *Banners) { extern const char *HidVis_DataClass[HidVis_NUM_HIDDEN_VISIBLE]; - static const Act_Action_t ActionHideUnhide[HidVis_NUM_HIDDEN_VISIBLE] = + static Act_Action_t ActionHideUnhide[HidVis_NUM_HIDDEN_VISIBLE] = { [HidVis_HIDDEN ] = ActUnhBan, // Hidden ==> action to unhide [HidVis_VISIBLE] = ActHidBan, // Visible ==> action to hide }; - static const Act_Action_t ActionRename[Nam_NUM_SHRT_FULL_NAMES] = + static Act_Action_t ActionRename[Nam_NUM_SHRT_FULL_NAMES] = { [Nam_SHRT_NAME] = ActRenBanSho, [Nam_FULL_NAME] = ActRenBanFul, @@ -854,7 +854,7 @@ static void Ban_PutHeadBanners (void) /******************* Receive form to create a new banner *********************/ /*****************************************************************************/ -void Ban_ReceiveFormNewBanner (void) +void Ban_ReceiveNewBanner (void) { extern const char *Nam_Fields[Nam_NUM_SHRT_FULL_NAMES]; extern const char *Txt_You_must_specify_the_image_of_the_new_banner; diff --git a/swad_banner.h b/swad_banner.h index 81edf8dd..896dc118 100644 --- a/swad_banner.h +++ b/swad_banner.h @@ -67,7 +67,7 @@ void Ban_RenameBannerFull (void); void Ban_ChangeBannerImg (void); void Ban_ChangeBannerWWW (void); void Ban_ContEditAfterChgBan (void); -void Ban_ReceiveFormNewBanner (void); +void Ban_ReceiveNewBanner (void); void Ban_WriteMenuWithBanners (void); void Ban_ClickOnBanner (void); diff --git a/swad_browser.c b/swad_browser.c index a20e7de1..bff50fdb 100644 --- a/swad_browser.c +++ b/swad_browser.c @@ -301,7 +301,7 @@ static const Brw_FileBrowser_t Brw_FileBrowserForDB_clipboard[Brw_NUM_TYPES_FILE [Brw_ADMI_ASS_PRJ] = Brw_ADMI_ASS_PRJ, }; -static const Act_Action_t Brw_ActSeeAdm[Brw_NUM_TYPES_FILE_BROWSER] = +static Act_Action_t Brw_ActSeeAdm[Brw_NUM_TYPES_FILE_BROWSER] = { [Brw_UNKNOWN ] = ActUnk, [Brw_SHOW_DOC_CRS] = ActSeeDocCrs, @@ -334,7 +334,7 @@ static const Act_Action_t Brw_ActSeeAdm[Brw_NUM_TYPES_FILE_BROWSER] = [Brw_ADMI_ASS_PRJ] = ActAdmAssPrj, }; -static const Act_Action_t Brw_ActFromSeeToAdm[Brw_NUM_TYPES_FILE_BROWSER] = +static Act_Action_t Brw_ActFromSeeToAdm[Brw_NUM_TYPES_FILE_BROWSER] = { [Brw_UNKNOWN ] = ActUnk, [Brw_SHOW_DOC_CRS] = ActAdmDocCrs, @@ -367,7 +367,7 @@ static const Act_Action_t Brw_ActFromSeeToAdm[Brw_NUM_TYPES_FILE_BROWSER] = [Brw_ADMI_ASS_PRJ] = ActUnk, }; -static const Act_Action_t Brw_ActFromAdmToSee[Brw_NUM_TYPES_FILE_BROWSER] = +static Act_Action_t Brw_ActFromAdmToSee[Brw_NUM_TYPES_FILE_BROWSER] = { [Brw_UNKNOWN ] = ActUnk, [Brw_SHOW_DOC_CRS] = ActUnk, @@ -400,7 +400,7 @@ static const Act_Action_t Brw_ActFromAdmToSee[Brw_NUM_TYPES_FILE_BROWSER] = [Brw_ADMI_ASS_PRJ] = ActUnk, }; -static const Act_Action_t Brw_ActChgZone[Brw_NUM_TYPES_FILE_BROWSER] = +static Act_Action_t Brw_ActChgZone[Brw_NUM_TYPES_FILE_BROWSER] = { [Brw_UNKNOWN ] = ActUnk, [Brw_SHOW_DOC_CRS] = ActChgToSeeDocCrs, @@ -433,7 +433,7 @@ static const Act_Action_t Brw_ActChgZone[Brw_NUM_TYPES_FILE_BROWSER] = [Brw_ADMI_ASS_PRJ] = ActUnk, }; -static const Act_Action_t Brw_ActReqDatFile[Brw_NUM_TYPES_FILE_BROWSER] = +static Act_Action_t Brw_ActReqDatFile[Brw_NUM_TYPES_FILE_BROWSER] = { [Brw_UNKNOWN ] = ActUnk, [Brw_SHOW_DOC_CRS] = ActReqDatSeeDocCrs, @@ -466,7 +466,7 @@ static const Act_Action_t Brw_ActReqDatFile[Brw_NUM_TYPES_FILE_BROWSER] = [Brw_ADMI_ASS_PRJ] = ActReqDatAssPrj, }; -static const Act_Action_t Brw_ActReqLnk[Brw_NUM_TYPES_FILE_BROWSER] = +static Act_Action_t Brw_ActReqLnk[Brw_NUM_TYPES_FILE_BROWSER] = { [Brw_UNKNOWN ] = ActUnk, [Brw_SHOW_DOC_CRS] = ActReqLnkSeeDocCrs, @@ -499,7 +499,7 @@ static const Act_Action_t Brw_ActReqLnk[Brw_NUM_TYPES_FILE_BROWSER] = [Brw_ADMI_ASS_PRJ] = ActUnk, }; -static const Act_Action_t Brw_ActDowFile[Brw_NUM_TYPES_FILE_BROWSER] = +static Act_Action_t Brw_ActDowFile[Brw_NUM_TYPES_FILE_BROWSER] = { [Brw_UNKNOWN ] = ActUnk, [Brw_SHOW_DOC_CRS] = ActDowSeeDocCrs, @@ -532,7 +532,7 @@ static const Act_Action_t Brw_ActDowFile[Brw_NUM_TYPES_FILE_BROWSER] = [Brw_ADMI_ASS_PRJ] = ActDowAssPrj, }; -static const Act_Action_t Brw_ActAskRemoveFile[Brw_NUM_TYPES_FILE_BROWSER] = +static Act_Action_t Brw_ActAskRemoveFile[Brw_NUM_TYPES_FILE_BROWSER] = { [Brw_UNKNOWN ] = ActUnk, [Brw_SHOW_DOC_CRS] = ActUnk, @@ -565,7 +565,7 @@ static const Act_Action_t Brw_ActAskRemoveFile[Brw_NUM_TYPES_FILE_BROWSER] = [Brw_ADMI_ASS_PRJ] = ActReqRemFilAssPrj, }; -static const Act_Action_t Brw_ActRemoveFile[Brw_NUM_TYPES_FILE_BROWSER] = +static Act_Action_t Brw_ActRemoveFile[Brw_NUM_TYPES_FILE_BROWSER] = { [Brw_UNKNOWN ] = ActUnk, [Brw_SHOW_DOC_CRS] = ActUnk, @@ -598,7 +598,7 @@ static const Act_Action_t Brw_ActRemoveFile[Brw_NUM_TYPES_FILE_BROWSER] = [Brw_ADMI_ASS_PRJ] = ActRemFilAssPrj, }; -static const Act_Action_t Brw_ActRemoveFolder[Brw_NUM_TYPES_FILE_BROWSER] = +static Act_Action_t Brw_ActRemoveFolder[Brw_NUM_TYPES_FILE_BROWSER] = { [Brw_UNKNOWN ] = ActUnk, [Brw_SHOW_DOC_CRS] = ActUnk, @@ -631,7 +631,7 @@ static const Act_Action_t Brw_ActRemoveFolder[Brw_NUM_TYPES_FILE_BROWSER] = [Brw_ADMI_ASS_PRJ] = ActRemFolAssPrj, }; -static const Act_Action_t Brw_ActRemoveFolderNotEmpty[Brw_NUM_TYPES_FILE_BROWSER] = +static Act_Action_t Brw_ActRemoveFolderNotEmpty[Brw_NUM_TYPES_FILE_BROWSER] = { [Brw_UNKNOWN ] = ActUnk, [Brw_SHOW_DOC_CRS] = ActUnk, @@ -664,7 +664,7 @@ static const Act_Action_t Brw_ActRemoveFolderNotEmpty[Brw_NUM_TYPES_FILE_BROWSER [Brw_ADMI_ASS_PRJ] = ActRemTreAssPrj, }; -static const Act_Action_t Brw_ActCopy[Brw_NUM_TYPES_FILE_BROWSER] = +static Act_Action_t Brw_ActCopy[Brw_NUM_TYPES_FILE_BROWSER] = { [Brw_UNKNOWN ] = ActUnk, [Brw_SHOW_DOC_CRS] = ActUnk, @@ -697,7 +697,7 @@ static const Act_Action_t Brw_ActCopy[Brw_NUM_TYPES_FILE_BROWSER] = [Brw_ADMI_ASS_PRJ] = ActCopAssPrj, }; -static const Act_Action_t Brw_ActPaste[Brw_NUM_TYPES_FILE_BROWSER] = +static Act_Action_t Brw_ActPaste[Brw_NUM_TYPES_FILE_BROWSER] = { [Brw_UNKNOWN ] = ActUnk, [Brw_SHOW_DOC_CRS] = ActUnk, @@ -730,7 +730,7 @@ static const Act_Action_t Brw_ActPaste[Brw_NUM_TYPES_FILE_BROWSER] = [Brw_ADMI_ASS_PRJ] = ActPasAssPrj, }; -static const Act_Action_t Brw_ActFormCreate[Brw_NUM_TYPES_FILE_BROWSER] = +static Act_Action_t Brw_ActFormCreate[Brw_NUM_TYPES_FILE_BROWSER] = { [Brw_UNKNOWN ] = ActUnk, [Brw_SHOW_DOC_CRS] = ActUnk, @@ -763,7 +763,7 @@ static const Act_Action_t Brw_ActFormCreate[Brw_NUM_TYPES_FILE_BROWSER] = [Brw_ADMI_ASS_PRJ] = ActFrmCreAssPrj, }; -static const Act_Action_t Brw_ActCreateFolder[Brw_NUM_TYPES_FILE_BROWSER] = +static Act_Action_t Brw_ActCreateFolder[Brw_NUM_TYPES_FILE_BROWSER] = { [Brw_UNKNOWN ] = ActUnk, [Brw_SHOW_DOC_CRS] = ActUnk, @@ -796,7 +796,7 @@ static const Act_Action_t Brw_ActCreateFolder[Brw_NUM_TYPES_FILE_BROWSER] = [Brw_ADMI_ASS_PRJ] = ActCreFolAssPrj, }; -static const Act_Action_t Brw_ActCreateLink[Brw_NUM_TYPES_FILE_BROWSER] = +static Act_Action_t Brw_ActCreateLink[Brw_NUM_TYPES_FILE_BROWSER] = { [Brw_UNKNOWN ] = ActUnk, [Brw_SHOW_DOC_CRS] = ActUnk, @@ -829,7 +829,7 @@ static const Act_Action_t Brw_ActCreateLink[Brw_NUM_TYPES_FILE_BROWSER] = [Brw_ADMI_ASS_PRJ] = ActCreLnkAssPrj, }; -static const Act_Action_t Brw_ActRenameFolder[Brw_NUM_TYPES_FILE_BROWSER] = +static Act_Action_t Brw_ActRenameFolder[Brw_NUM_TYPES_FILE_BROWSER] = { [Brw_UNKNOWN ] = ActUnk, [Brw_SHOW_DOC_CRS] = ActUnk, @@ -862,7 +862,7 @@ static const Act_Action_t Brw_ActRenameFolder[Brw_NUM_TYPES_FILE_BROWSER] = [Brw_ADMI_ASS_PRJ] = ActRenFolAssPrj, }; -static const Act_Action_t Brw_ActUploadFileDropzone[Brw_NUM_TYPES_FILE_BROWSER] = +static Act_Action_t Brw_ActUploadFileDropzone[Brw_NUM_TYPES_FILE_BROWSER] = { [Brw_UNKNOWN ] = ActUnk, [Brw_SHOW_DOC_CRS] = ActUnk, @@ -895,7 +895,7 @@ static const Act_Action_t Brw_ActUploadFileDropzone[Brw_NUM_TYPES_FILE_BROWSER] [Brw_ADMI_ASS_PRJ] = ActRcvFilAssPrjDZ, }; -static const Act_Action_t Brw_ActUploadFileClassic[Brw_NUM_TYPES_FILE_BROWSER] = +static Act_Action_t Brw_ActUploadFileClassic[Brw_NUM_TYPES_FILE_BROWSER] = { [Brw_UNKNOWN ] = ActUnk, [Brw_SHOW_DOC_CRS] = ActUnk, @@ -928,7 +928,7 @@ static const Act_Action_t Brw_ActUploadFileClassic[Brw_NUM_TYPES_FILE_BROWSER] = [Brw_ADMI_ASS_PRJ] = ActRcvFilAssPrjCla, }; -static const Act_Action_t Brw_ActRefreshAfterUploadFiles[Brw_NUM_TYPES_FILE_BROWSER] = +static Act_Action_t Brw_ActRefreshAfterUploadFiles[Brw_NUM_TYPES_FILE_BROWSER] = { [Brw_UNKNOWN ] = ActUnk, [Brw_SHOW_DOC_CRS] = ActUnk, @@ -961,7 +961,7 @@ static const Act_Action_t Brw_ActRefreshAfterUploadFiles[Brw_NUM_TYPES_FILE_BROW [Brw_ADMI_ASS_PRJ] = ActAdmAssPrj, }; -static const Act_Action_t Brw_ActExpandFolder[Brw_NUM_TYPES_FILE_BROWSER] = +static Act_Action_t Brw_ActExpandFolder[Brw_NUM_TYPES_FILE_BROWSER] = { [Brw_UNKNOWN ] = ActUnk, [Brw_SHOW_DOC_CRS] = ActExpSeeDocCrs, @@ -994,7 +994,7 @@ static const Act_Action_t Brw_ActExpandFolder[Brw_NUM_TYPES_FILE_BROWSER] = [Brw_ADMI_ASS_PRJ] = ActExpAssPrj, }; -static const Act_Action_t Brw_ActContractFolder[Brw_NUM_TYPES_FILE_BROWSER] = +static Act_Action_t Brw_ActContractFolder[Brw_NUM_TYPES_FILE_BROWSER] = { [Brw_UNKNOWN ] = ActUnk, [Brw_SHOW_DOC_CRS] = ActConSeeDocCrs, @@ -1027,7 +1027,7 @@ static const Act_Action_t Brw_ActContractFolder[Brw_NUM_TYPES_FILE_BROWSER] = [Brw_ADMI_ASS_PRJ] = ActConAssPrj, }; -static const Act_Action_t Brw_ActRecDatFile[Brw_NUM_TYPES_FILE_BROWSER] = +static Act_Action_t Brw_ActRecDatFile[Brw_NUM_TYPES_FILE_BROWSER] = { [Brw_UNKNOWN ] = ActUnk, [Brw_SHOW_DOC_CRS] = ActUnk, @@ -1060,7 +1060,7 @@ static const Act_Action_t Brw_ActRecDatFile[Brw_NUM_TYPES_FILE_BROWSER] = [Brw_ADMI_ASS_PRJ] = ActChgDatAssPrj, }; -static const Act_Action_t Brw_ActZIPFolder[Brw_NUM_TYPES_FILE_BROWSER] = +static Act_Action_t Brw_ActZIPFolder[Brw_NUM_TYPES_FILE_BROWSER] = { [Brw_UNKNOWN ] = ActUnk, [Brw_SHOW_DOC_CRS] = ActZIPSeeDocCrs, @@ -2983,7 +2983,7 @@ static void Brw_GetSelectedGroupData (struct GroupData *GrpDat,bool AbortOnError static void Brw_ShowDataOwnerAsgWrk (struct Usr_Data *UsrDat) { extern const char *Txt_View_record_for_this_course; - static const Act_Action_t NextAction[Rol_NUM_ROLES] = + static Act_Action_t NextAction[Rol_NUM_ROLES] = { [Rol_STD] = ActSeeRecOneStd, [Rol_NET] = ActSeeRecOneTch, @@ -4394,7 +4394,7 @@ static void Brw_PutIconToContractFolder (const char *FileBrowserId,const char *R static void Brw_PutIconHideUnhide (const char *Anchor, HidVis_HiddenOrVisible_t HiddenOrVisible) { - static const Act_Action_t Brw_ActHideUnhide[Brw_NUM_TYPES_FILE_BROWSER][HidVis_NUM_HIDDEN_VISIBLE] = + static Act_Action_t Brw_ActHideUnhide[Brw_NUM_TYPES_FILE_BROWSER][HidVis_NUM_HIDDEN_VISIBLE] = { [Brw_UNKNOWN ] = {[HidVis_HIDDEN] = ActUnk ,[HidVis_VISIBLE] = ActUnk }, [Brw_SHOW_DOC_CRS] = {[HidVis_HIDDEN] = ActUnk ,[HidVis_VISIBLE] = ActUnk }, @@ -4632,7 +4632,7 @@ static void Brw_PutIconFileWithLinkToViewMetadata (const struct Brw_FileMetadata void Brw_PutIconFile (const char *FileName, const char *Class,Frm_PutForm_t PutFormToGo) { - extern const unsigned Ext_NUM_FILE_EXT_ALLOWED; + extern unsigned Ext_NUM_FILE_EXT_ALLOWED; extern const char *Ext_FileExtensionsAllowed[]; extern const char *Txt_X_file; char *URL; diff --git a/swad_browser_size.c b/swad_browser_size.c index d32b818b..a36fc89b 100644 --- a/swad_browser_size.c +++ b/swad_browser_size.c @@ -117,7 +117,7 @@ #define BrwSiz_MAX_FILES_MARKS_GRP 200 #define BrwSiz_MAX_FOLDS_MARKS_GRP 20 -static const unsigned long long BrwSiz_MAX_QUOTA_BRIEF[Rol_NUM_ROLES] = // MaxRole is used +static unsigned long long BrwSiz_MAX_QUOTA_BRIEF[Rol_NUM_ROLES] = // MaxRole is used { [Rol_STD] = 32ULL*BrwSiz_GiB, [Rol_NET] = 32ULL*BrwSiz_GiB, diff --git a/swad_building.c b/swad_building.c index 2699c8c9..fb5a72a9 100644 --- a/swad_building.c +++ b/swad_building.c @@ -388,7 +388,7 @@ void Bld_FreeListBuildings (struct Bld_Buildings *Buildings) static void Bld_ListBuildingsForEdition (const struct Bld_Buildings *Buildings) { - static const Act_Action_t ActionRename[Nam_NUM_SHRT_FULL_NAMES] = + static Act_Action_t ActionRename[Nam_NUM_SHRT_FULL_NAMES] = { [Nam_SHRT_NAME] = ActRenBldSho, [Nam_FULL_NAME] = ActRenBldFul, @@ -714,7 +714,7 @@ static void Bld_PutHeadBuildings (void) /***************** Receive form to create a new building *********************/ /*****************************************************************************/ -void Bld_ReceiveFormNewBuilding (void) +void Bld_ReceiveNewBuilding (void) { extern const char *Txt_Created_new_building_X; char *Names[Nam_NUM_SHRT_FULL_NAMES]; diff --git a/swad_building.h b/swad_building.h index 303a12ae..e5c6aec5 100644 --- a/swad_building.h +++ b/swad_building.h @@ -92,6 +92,6 @@ void Bld_RenameBuildingFull (void); void Bld_ChangeBuildingLocation (void); void Bld_ContEditAfterChgBuilding (void); -void Bld_ReceiveFormNewBuilding (void); +void Bld_ReceiveNewBuilding (void); #endif diff --git a/swad_call_for_exam.c b/swad_call_for_exam.c index 6a0eb5cf..5868cef9 100644 --- a/swad_call_for_exam.c +++ b/swad_call_for_exam.c @@ -1457,7 +1457,7 @@ static void Cfe_ShowCallForExam (struct Cfe_CallsForExams *CallsForExams, static void Cfe_PutIconsCallForExam (void *CallsForExams) { - static const Act_Action_t ActionHideUnhide[HidVis_NUM_HIDDEN_VISIBLE] = + static Act_Action_t ActionHideUnhide[HidVis_NUM_HIDDEN_VISIBLE] = { [HidVis_HIDDEN ] = ActUnhCfe, // Hidden ==> action to unhide [HidVis_VISIBLE] = ActHidCfe, // Visible ==> action to hide diff --git a/swad_center.c b/swad_center.c index 8d757022..430b99a4 100644 --- a/swad_center.c +++ b/swad_center.c @@ -96,7 +96,7 @@ static void Ctr_ShowAlertAndButtonToGoToCtr (void); static void Ctr_PutFormToCreateCenter (const struct Plc_Places *Places); static void Ctr_PutHeadCentersForSeeing (bool OrderSelectable); static void Ctr_PutHeadCentersForEdition (void); -static void Ctr_ReceiveFormRequestOrCreateCtr (Hie_Status_t Status); +static void Ctr_ReceiveRequestOrCreateCtr (Hie_Status_t Status); static void Ctr_EditingCenterConstructor (void); static void Ctr_EditingCenterDestructor (void); @@ -726,7 +726,7 @@ static void Ctr_ListCentersForEdition (const struct Plc_Places *Places) { extern const char *Txt_Another_place; extern const char *Txt_CENTER_STATUS[Hie_NUM_STATUS_TXT]; - static const Act_Action_t ActionRename[Nam_NUM_SHRT_FULL_NAMES] = + static Act_Action_t ActionRename[Nam_NUM_SHRT_FULL_NAMES] = { [Nam_SHRT_NAME] = ActRenCtrSho, [Nam_FULL_NAME] = ActRenCtrFul, @@ -1422,33 +1422,33 @@ static void Ctr_PutHeadCentersForEdition (void) /****************** Receive form to request a new center *********************/ /*****************************************************************************/ -void Ctr_ReceiveFormReqCtr (void) +void Ctr_ReceiveReqCtr (void) { /***** Center constructor *****/ Ctr_EditingCenterConstructor (); /***** Receive form to request a new center *****/ - Ctr_ReceiveFormRequestOrCreateCtr ((Hie_Status_t) Hie_STATUS_BIT_PENDING); + Ctr_ReceiveRequestOrCreateCtr ((Hie_Status_t) Hie_STATUS_BIT_PENDING); } /*****************************************************************************/ /******************* Receive form to create a new center *********************/ /*****************************************************************************/ -void Ctr_ReceiveFormNewCtr (void) +void Ctr_ReceiveNewCtr (void) { /***** Center constructor *****/ Ctr_EditingCenterConstructor (); /***** Receive form to create a new center *****/ - Ctr_ReceiveFormRequestOrCreateCtr ((Hie_Status_t) 0); + Ctr_ReceiveRequestOrCreateCtr ((Hie_Status_t) 0); } /*****************************************************************************/ /************* Receive form to request or create a new center ****************/ /*****************************************************************************/ -static void Ctr_ReceiveFormRequestOrCreateCtr (Hie_Status_t Status) +static void Ctr_ReceiveRequestOrCreateCtr (Hie_Status_t Status) { extern const char *Txt_Created_new_center_X; char *Names[Nam_NUM_SHRT_FULL_NAMES]; diff --git a/swad_center.h b/swad_center.h index 5553c4db..4f8fe3c1 100644 --- a/swad_center.h +++ b/swad_center.h @@ -63,8 +63,8 @@ void Ctr_ChangeCtrWWW (void); void Ctr_ChangeCtrStatus (void); void Ctr_ContEditAfterChgCtr (void); -void Ctr_ReceiveFormReqCtr (void); -void Ctr_ReceiveFormNewCtr (void); +void Ctr_ReceiveReqCtr (void); +void Ctr_ReceiveNewCtr (void); unsigned Ctr_GetCachedNumCtrsWithMapInSys (void); unsigned Ctr_GetCachedNumCtrsWithMapInCty (long CtyCod); diff --git a/swad_changelog.h b/swad_changelog.h index 7834faba..64fedb7a 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -633,10 +633,12 @@ Me sale este error, no s "can npt create received message (duplicated entry '243218-2160773' for key 'UsrCod_MsgCod') */ -#define Log_PLATFORM_VERSION "SWAD 23.71 (2024-03-20)" +#define Log_PLATFORM_VERSION "SWAD 23.71.2 (2024-03-20)" #define CSS_FILE "swad23.67.2.css" #define JS_FILE "swad23.53.6.js" /* + Version 23.71.2: Mar 20, 2024 Code refactoring in actions. (334866 lines) + Version 23.71.1: Mar 20, 2024 Some functions renamed. (334869 lines) Version 23.71: Mar 20, 2024 Actions for syllabus unified for lectures and practicals. (334868 lines) Version 23.70.2: Mar 19, 2024 Changes in course info. (335353 lines) Version 23.70.1: Mar 19, 2024 Bug fixing in syllabus. (335429 lines) diff --git a/swad_config.h b/swad_config.h index 0afc743e..d64e0f67 100644 --- a/swad_config.h +++ b/swad_config.h @@ -433,14 +433,14 @@ #define Cfg_SYLLABUS_FILENAME "syllabus.xml" /* Main folders in file browsers */ -#define Cfg_CRS_INFO_INTRODUCTION "intro" -#define Cfg_CRS_INFO_TEACHING_GUIDE "description" -#define Cfg_CRS_INFO_LECTURES "teoria" -#define Cfg_CRS_INFO_PRACTICALS "practicas" -#define Cfg_CRS_INFO_BIBLIOGRAPHY "bibliografia" -#define Cfg_CRS_INFO_FAQ "FAQ" -#define Cfg_CRS_INFO_LINKS "enlaces" -#define Cfg_CRS_INFO_ASSESSMENT "evaluacion" +#define Cfg_CRS_INFO_INFORMATION "intro" // TODO: Change to inf +#define Cfg_CRS_INFO_TEACHING_GUIDE "description" // TODO: Change to gui +#define Cfg_CRS_INFO_LECTURES "teoria" // TODO: Change to lec +#define Cfg_CRS_INFO_PRACTICALS "practicas" // TODO: Change to pra +#define Cfg_CRS_INFO_BIBLIOGRAPHY "bibliografia" // TODO: Change to bib +#define Cfg_CRS_INFO_FAQ "FAQ" // TODO: Change to faq +#define Cfg_CRS_INFO_LINKS "enlaces" // TODO: Change to lnk +#define Cfg_CRS_INFO_ASSESSMENT "evaluacion" // TODO: Change to ass /* RSS folders and files */ #define Cfg_RSS_FOLDER "rss" diff --git a/swad_connected.c b/swad_connected.c index a9174d06..9e00f210 100644 --- a/swad_connected.c +++ b/swad_connected.c @@ -523,7 +523,7 @@ static void Con_ShowConnectedUsrsCurrentCrsOneByOneOnRightColumn (Rol_Role_t Rol static void Con_WriteRowConnectedUsrOnRightColumn (Rol_Role_t Role) { extern const char *Txt_View_record_for_this_course; - static const Act_Action_t NextAction[Rol_NUM_ROLES] = + static Act_Action_t NextAction[Rol_NUM_ROLES] = { [Rol_STD] = ActSeeRecOneStd, [Rol_NET] = ActSeeRecOneTch, @@ -624,7 +624,7 @@ static void Con_WriteRowConnectedUsrOnRightColumn (Rol_Role_t Role) static void Con_ShowConnectedUsrsCurrentLocationOneByOneOnMainZone (Rol_Role_t Role) { - static const Act_Action_t NextAction[Rol_NUM_ROLES] = + static Act_Action_t NextAction[Rol_NUM_ROLES] = { [Rol_STD] = ActSeeRecOneStd, [Rol_NET] = ActSeeRecOneTch, diff --git a/swad_country.c b/swad_country.c index 28ce0676..9aae738c 100644 --- a/swad_country.c +++ b/swad_country.c @@ -1506,7 +1506,7 @@ static void Cty_PutHeadCountriesForEdition (void) /******************* Receive form to create a new country ********************/ /*****************************************************************************/ -void Cty_ReceiveFormNewCountry (void) +void Cty_ReceiveNewCountry (void) { extern const char *Txt_You_must_specify_the_numerical_code_of_the_new_country; extern const char *Txt_The_numerical_code_X_already_exists; diff --git a/swad_country.h b/swad_country.h index 8d70062c..bdb248e5 100644 --- a/swad_country.h +++ b/swad_country.h @@ -78,7 +78,7 @@ void Cty_RemoveCountry (void); void Cty_RenameCountry (void); void Cty_ChangeCtyWWW (void); void Cty_ContEditAfterChgCty (void); -void Cty_ReceiveFormNewCountry (void); +void Cty_ReceiveNewCountry (void); unsigned Cty_GetCachedNumCtysWithUsrs (Rol_Role_t Role); diff --git a/swad_course.c b/swad_course.c index a0c8269f..6e256317 100644 --- a/swad_course.c +++ b/swad_course.c @@ -104,7 +104,7 @@ static bool Crs_CheckIfICanEdit (struct Hie_Node *Crs); static void Crs_PutFormToCreateCourse (void); static void Crs_PutHeadCoursesForSeeing (void); static void Crs_PutHeadCoursesForEdition (void); -static void Crs_ReceiveFormRequestOrCreateCrs (Hie_Status_t Status); +static void Crs_ReceiveRequestOrCreateCrs (Hie_Status_t Status); static void Crs_GetParsNewCourse (struct Hie_Node *Crs); static void Crs_GetCourseDataFromRow (MYSQL_RES *mysql_res, @@ -653,7 +653,7 @@ static void Crs_ListCoursesOfAYearForEdition (unsigned Year) { extern const char *Txt_YEAR_OF_DEGREE[1 + Deg_MAX_YEARS_PER_DEGREE]; extern const char *Txt_COURSE_STATUS[Hie_NUM_STATUS_TXT]; - static const Act_Action_t ActionRename[Nam_NUM_SHRT_FULL_NAMES] = + static Act_Action_t ActionRename[Nam_NUM_SHRT_FULL_NAMES] = { [Nam_SHRT_NAME] = ActRenCrsSho, [Nam_FULL_NAME] = ActRenCrsFul, @@ -942,33 +942,33 @@ static void Crs_PutHeadCoursesForEdition (void) /****************** Receive form to request a new course *********************/ /*****************************************************************************/ -void Crs_ReceiveFormReqCrs (void) +void Crs_ReceiveReqCrs (void) { /***** Course constructor *****/ Crs_EditingCourseConstructor (); /***** Receive form to request a new course *****/ - Crs_ReceiveFormRequestOrCreateCrs ((Hie_Status_t) Hie_STATUS_BIT_PENDING); + Crs_ReceiveRequestOrCreateCrs ((Hie_Status_t) Hie_STATUS_BIT_PENDING); } /*****************************************************************************/ /******************* Receive form to create a new course *********************/ /*****************************************************************************/ -void Crs_ReceiveFormNewCrs (void) +void Crs_ReceiveNewCrs (void) { /***** Course constructor *****/ Crs_EditingCourseConstructor (); /***** Receive form to create a new course *****/ - Crs_ReceiveFormRequestOrCreateCrs ((Hie_Status_t) 0); + Crs_ReceiveRequestOrCreateCrs ((Hie_Status_t) 0); } /*****************************************************************************/ /************* Receive form to request or create a new course ****************/ /*****************************************************************************/ -static void Crs_ReceiveFormRequestOrCreateCrs (Hie_Status_t Status) +static void Crs_ReceiveRequestOrCreateCrs (Hie_Status_t Status) { extern const char *Txt_Created_new_course_X; extern const char *Txt_The_year_X_is_not_allowed; diff --git a/swad_course.h b/swad_course.h index c67ba288..916ed75d 100644 --- a/swad_course.h +++ b/swad_course.h @@ -59,8 +59,8 @@ void Crs_WriteSelectorMyCoursesInBreadcrumb (void); void Crs_EditCourses (void); -void Crs_ReceiveFormReqCrs (void); -void Crs_ReceiveFormNewCrs (void); +void Crs_ReceiveReqCrs (void); +void Crs_ReceiveNewCrs (void); void Crs_RemoveCourse (void); bool Crs_GetCourseDataByCod (struct Hie_Node *Crs); diff --git a/swad_date.c b/swad_date.c index 6c094464..3bf7b721 100644 --- a/swad_date.c +++ b/swad_date.c @@ -74,7 +74,7 @@ const char *Dat_TimeStatusClass[Dat_NUM_TIME_STATUS][HidVis_NUM_HIDDEN_VISIBLE] /**************************** Private constants ******************************/ /*****************************************************************************/ -static const unsigned Dat_NumDaysMonth[1 + 12] = +static unsigned Dat_NumDaysMonth[1 + 12] = { [ 0] = 0, [ 1] = 31, // January @@ -1098,7 +1098,7 @@ void Dat_GetDateFromForm (const char *ParNameDay,const char *ParNameMonth,const /******* Set initial date to distant past and end date to current date *******/ /*****************************************************************************/ -void Dat_SetIniEndDatesToPastAndNow (void) +void Dat_SetDatesToPastAndNow (void) { Dat_Time.Range.TimeUTC[Dat_STR_TIME] = (time_t) 0; Dat_Time.Range.TimeUTC[Dat_END_TIME] = Dat_GetStartExecutionTimeUTC (); @@ -1109,7 +1109,7 @@ void Dat_SetIniEndDatesToPastAndNow (void) /************ and set initial date to end date minus several days ************/ /*****************************************************************************/ -void Dat_SetIniEndDatesToRecentWeeks (void) +void Dat_SetDatesToRecentWeeks (void) { Dat_Time.Range.TimeUTC[Dat_END_TIME] = Dat_GetStartExecutionTimeUTC (); Dat_Time.Range.TimeUTC[Dat_STR_TIME] = Dat_Time.Range.TimeUTC[Dat_END_TIME] - diff --git a/swad_date.h b/swad_date.h index dc67a1b2..c0db5aad 100644 --- a/swad_date.h +++ b/swad_date.h @@ -190,8 +190,8 @@ void Dat_WriteFormDate (unsigned FirstYear,unsigned LastYear, void Dat_GetDateFromForm (const char *ParNameDay,const char *ParNameMonth,const char *ParNameYear, unsigned *Day,unsigned *Month,unsigned *Year); -void Dat_SetIniEndDatesToPastAndNow (void); -void Dat_SetIniEndDatesToRecentWeeks (void); +void Dat_SetDatesToPastAndNow (void); +void Dat_SetDatesToRecentWeeks (void); void Dat_WriteParsIniEndDates (void); void Dat_GetIniEndDatesFromForm (void); diff --git a/swad_degree.c b/swad_degree.c index d2b44372..c93bec68 100644 --- a/swad_degree.c +++ b/swad_degree.c @@ -97,7 +97,7 @@ static void Deg_ListOneDegreeForSeeing (struct Hie_Node *Deg,unsigned NumDeg); static void Deg_EditDegreesInternal (void); static void Deg_PutIconsEditingDegrees (__attribute__((unused)) void *Args); -static void Deg_ReceiveFormRequestOrCreateDeg (Hie_Status_t Status); +static void Deg_ReceiveRequestOrCreateDeg (Hie_Status_t Status); static void Deg_GetDegreeDataFromRow (MYSQL_RES *mysql_res, struct Hie_Node *Deg); @@ -314,7 +314,7 @@ void Deg_ShowDegsOfCurrentCtr (void) static void Deg_ListDegreesForEdition (const struct DegTyp_DegTypes *DegTypes) { extern const char *Txt_DEGREE_STATUS[Hie_NUM_STATUS_TXT]; - static const Act_Action_t ActionRename[Nam_NUM_SHRT_FULL_NAMES] = + static Act_Action_t ActionRename[Nam_NUM_SHRT_FULL_NAMES] = { [Nam_SHRT_NAME] = ActRenDegSho, [Nam_FULL_NAME] = ActRenDegFul, @@ -999,33 +999,33 @@ void Deg_FreeListAllDegsWithStds (struct Hie_List *Degs) /****************** Receive form to request a new degree *********************/ /*****************************************************************************/ -void Deg_ReceiveFormReqDeg (void) +void Deg_ReceiveReqDeg (void) { /***** Degree constructor *****/ Deg_EditingDegreeConstructor (); /***** Receive form to request a new degree *****/ - Deg_ReceiveFormRequestOrCreateDeg ((Hie_Status_t) Hie_STATUS_BIT_PENDING); + Deg_ReceiveRequestOrCreateDeg ((Hie_Status_t) Hie_STATUS_BIT_PENDING); } /*****************************************************************************/ /******************* Receive form to create a new degree *********************/ /*****************************************************************************/ -void Deg_ReceiveFormNewDeg (void) +void Deg_ReceiveNewDeg (void) { /***** Degree constructor *****/ Deg_EditingDegreeConstructor (); /***** Receive form to create a new degree *****/ - Deg_ReceiveFormRequestOrCreateDeg ((Hie_Status_t) 0); + Deg_ReceiveRequestOrCreateDeg ((Hie_Status_t) 0); } /*****************************************************************************/ /******************* Receive form to create a new degree *********************/ /*****************************************************************************/ -static void Deg_ReceiveFormRequestOrCreateDeg (Hie_Status_t Status) +static void Deg_ReceiveRequestOrCreateDeg (Hie_Status_t Status) { extern const char *Txt_Created_new_degree_X; char *Names[Nam_NUM_SHRT_FULL_NAMES]; diff --git a/swad_degree.h b/swad_degree.h index 3c0b2577..b998c836 100644 --- a/swad_degree.h +++ b/swad_degree.h @@ -66,8 +66,8 @@ void Deg_GetListAllDegsWithStds (struct Hie_List *Degs); void Deg_GetListDegsInCurrentCtr (void); void Deg_FreeListAllDegsWithStds (struct Hie_List *Degs); -void Deg_ReceiveFormReqDeg (void); -void Deg_ReceiveFormNewDeg (void); +void Deg_ReceiveReqDeg (void); +void Deg_ReceiveNewDeg (void); void Deg_RemoveDegree (void); bool Deg_GetDegreeDataByCod (struct Hie_Node *Node); diff --git a/swad_degree_type.c b/swad_degree_type.c index 33acc80d..fb4aedd7 100644 --- a/swad_degree_type.c +++ b/swad_degree_type.c @@ -637,7 +637,7 @@ void DegTyp_FreeListDegreeTypes (struct DegTyp_DegTypes *DegTypes) /***************** Receive form to create a new degree type ******************/ /*****************************************************************************/ -void DegTyp_ReceiveFormNewDegreeType (void) +void DegTyp_ReceiveNewDegreeType (void) { extern const char *Txt_The_type_of_degree_X_already_exists; extern const char *Txt_Created_new_type_of_degree_X; diff --git a/swad_degree_type.h b/swad_degree_type.h index 88c6c3c3..df647052 100644 --- a/swad_degree_type.h +++ b/swad_degree_type.h @@ -79,7 +79,7 @@ void DegTyp_GetListDegreeTypes (struct DegTyp_DegTypes *DegTypes, Hie_Level_t Level,DegTyp_Order_t Order); void DegTyp_FreeListDegreeTypes (struct DegTyp_DegTypes *DegTypes); -void DegTyp_ReceiveFormNewDegreeType (void); +void DegTyp_ReceiveNewDegreeType (void); void DegTyp_RemoveDegreeType (void); diff --git a/swad_department.c b/swad_department.c index 6cd1a4f0..6615e87a 100644 --- a/swad_department.c +++ b/swad_department.c @@ -441,7 +441,7 @@ static void Dpt_GetDepartmentDataFromRow (MYSQL_RES *mysql_res, static void Dpt_ListDepartmentsForEdition (const struct Dpt_Departments *Departments) { extern const char *Txt_Another_institution; - static const Act_Action_t ActionRename[Nam_NUM_SHRT_FULL_NAMES] = + static Act_Action_t ActionRename[Nam_NUM_SHRT_FULL_NAMES] = { [Nam_SHRT_NAME] = ActRenDptSho, [Nam_FULL_NAME] = ActRenDptFul, @@ -862,7 +862,7 @@ static void Dpt_PutHeadDepartments (void) /***************** Receive form to create a new department *******************/ /*****************************************************************************/ -void Dpt_ReceiveFormNewDpt (void) +void Dpt_ReceiveNewDpt (void) { extern const char *Txt_Created_new_department_X; char *Names[Nam_NUM_SHRT_FULL_NAMES]; diff --git a/swad_department.h b/swad_department.h index bd989293..255dc2e1 100644 --- a/swad_department.h +++ b/swad_department.h @@ -73,7 +73,7 @@ void Dpt_RenameDepartFull (void); void Dpt_ChangeDptWWW (void); void Dpt_ContEditAfterChgDpt (void); -void Dpt_ReceiveFormNewDpt (void); +void Dpt_ReceiveNewDpt (void); unsigned Dpt_GetTotalNumberOfDepartments (void); void Dpt_FlushCacheNumDptsInIns (void); unsigned Dpt_GetNumDptsInIns (long InsCod); diff --git a/swad_enrolment.c b/swad_enrolment.c index a3682f02..cb47647e 100644 --- a/swad_enrolment.c +++ b/swad_enrolment.c @@ -111,7 +111,7 @@ static void Enr_ShowFormRegRemSeveralUsrs (Rol_Role_t Role); static void Enr_PutAreaToEnterUsrsIDs (void); static void Enr_PutActionsRegRemSeveralUsrs (void); -static void Enr_ReceiveFormUsrsCrs (Rol_Role_t Role); +static void Enr_ReceiveUsrsCrs (Rol_Role_t Role); static void Enr_PutActionModifyOneUsr (bool *OptionChecked, bool UsrBelongsToCrs,Usr_MeOrOther_t MeOrOther); @@ -873,22 +873,22 @@ static void Enr_PutActionsRegRemSeveralUsrs (void) /******* Receive the list of users of the course to register/remove **********/ /*****************************************************************************/ -void Enr_ReceiveFormAdminStds (void) +void Enr_ReceiveAdminStds (void) { - Enr_ReceiveFormUsrsCrs (Rol_STD); + Enr_ReceiveUsrsCrs (Rol_STD); } -void Enr_ReceiveFormAdminNonEditTchs (void) +void Enr_ReceiveAdminNonEditTchs (void) { - Enr_ReceiveFormUsrsCrs (Rol_NET); + Enr_ReceiveUsrsCrs (Rol_NET); } -void Enr_ReceiveFormAdminTchs (void) +void Enr_ReceiveAdminTchs (void) { - Enr_ReceiveFormUsrsCrs (Rol_TCH); + Enr_ReceiveUsrsCrs (Rol_TCH); } -static void Enr_ReceiveFormUsrsCrs (Rol_Role_t Role) +static void Enr_ReceiveUsrsCrs (Rol_Role_t Role) { extern const char *Txt_In_a_type_of_group_with_single_enrolment_students_can_not_be_registered_in_more_than_one_group; extern const char *Txt_No_user_has_been_eliminated; @@ -2121,7 +2121,7 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected) bool UsrExists; bool UsrBelongsToCrs; Rol_Role_t DesiredRole; - static const Act_Action_t NextAction[Rol_NUM_ROLES] = + static Act_Action_t NextAction[Rol_NUM_ROLES] = { [Rol_STD] = ActReqMdfStd, [Rol_NET] = ActReqMdfNET, @@ -2461,7 +2461,7 @@ static void Enr_ReqAnotherUsrIDToRegisterRemove (Rol_Role_t Role) { extern const char *Hlp_USERS_Administration_administer_one_user; extern const char *Txt_Administer_one_user; - static const Act_Action_t NextAction[Rol_NUM_ROLES] = + static Act_Action_t NextAction[Rol_NUM_ROLES] = { [Rol_GST] = ActReqMdfOth, [Rol_STD] = ActReqMdfStd, @@ -2775,7 +2775,7 @@ void Enr_CreateNewUsr1 (void) extern const char *Txt_The_ID_X_is_not_valid; Rol_Role_t OldRole; Rol_Role_t NewRole; - static const Act_Action_t Action[Rol_NUM_ROLES] = + static Act_Action_t Action[Rol_NUM_ROLES] = { [Rol_GST] = ActCreOth, [Rol_STD] = ActCreStd, @@ -2877,7 +2877,7 @@ void Enr_ModifyUsr1 (void) Usr_MeOrOther_t MeOrOther; Rol_Role_t OldRole; Rol_Role_t NewRole; - static const Act_Action_t Action[Rol_NUM_ROLES] = + static Act_Action_t Action[Rol_NUM_ROLES] = { [Rol_GST] = ActUpdOth, [Rol_STD] = ActUpdStd, @@ -3083,7 +3083,7 @@ static void Enr_AskIfRemoveUsrFromCrs (struct Usr_Data *UsrDat) extern const char *Txt_Remove_me_from_this_course; extern const char *Txt_Remove_user_from_this_course; Usr_MeOrOther_t MeOrOther; - static const Act_Action_t NextAction[Rol_NUM_ROLES] = + static Act_Action_t NextAction[Rol_NUM_ROLES] = { [Rol_STD] = ActRemStdCrs, [Rol_NET] = ActRemNETCrs, diff --git a/swad_enrolment.h b/swad_enrolment.h index 491eea67..8f95f5ea 100644 --- a/swad_enrolment.h +++ b/swad_enrolment.h @@ -99,9 +99,9 @@ void Enr_PutLinkToRemOldUsrs (void); void Enr_AskRemoveOldUsrs (void); void Enr_RemoveOldUsrs (void); -void Enr_ReceiveFormAdminStds (void); -void Enr_ReceiveFormAdminNonEditTchs (void); -void Enr_ReceiveFormAdminTchs (void); +void Enr_ReceiveAdminStds (void); +void Enr_ReceiveAdminNonEditTchs (void); +void Enr_ReceiveAdminTchs (void); bool Enr_PutActionsRegRemOneUsr (Usr_MeOrOther_t MeOrOther); diff --git a/swad_exam.c b/swad_exam.c index 059a28d2..5ca0a079 100644 --- a/swad_exam.c +++ b/swad_exam.c @@ -332,7 +332,7 @@ bool Exa_CheckIfICanEditExams (void) static void Exa_PutIconsListExams (void *Exams) { - static const Act_Action_t NextAction[Rol_NUM_ROLES] = + static Act_Action_t NextAction[Rol_NUM_ROLES] = { [Rol_STD ] = ActSeeMyExaResCrs, [Rol_NET ] = ActReqSeeUsrExaRes, @@ -658,12 +658,12 @@ static void Exa_PutParExamOrder (Exa_Order_t SelectedOrder) static void Exa_PutIconsToRemEditOneExam (struct Exa_Exams *Exams, const char *Anchor) { - static const Act_Action_t ActionHideUnhide[HidVis_NUM_HIDDEN_VISIBLE] = + static Act_Action_t ActionHideUnhide[HidVis_NUM_HIDDEN_VISIBLE] = { [HidVis_HIDDEN ] = ActUnhExa, // Hidden ==> action to unhide [HidVis_VISIBLE] = ActHidExa, // Visible ==> action to hide }; - static const Act_Action_t ActionShowResults[Rol_NUM_ROLES] = + static Act_Action_t ActionShowResults[Rol_NUM_ROLES] = { [Rol_STD ] = ActSeeMyExaResExa, [Rol_NET ] = ActSeeUsrExaResExa, @@ -1317,7 +1317,7 @@ static void Exa_PutFormEditionExam (struct Exa_Exams *Exams, extern const char *Txt_Description; extern const char *Txt_Save_changes; extern const char *Txt_Create; - static const Act_Action_t NextAction[] = + static Act_Action_t NextAction[] = { [Exa_EXISTING_EXAM] = ActChgExa, [Exa_NEW_EXAM ] = ActNewExa, @@ -1420,7 +1420,7 @@ static void Exa_PutFormEditionExam (struct Exa_Exams *Exams, /********************** Receive form to create a new exam ********************/ /*****************************************************************************/ -void Exa_ReceiveFormExam (void) +void Exa_ReceiveExam (void) { struct Exa_Exams Exams; Exa_ExistingNewExam_t ExistingNewExam; diff --git a/swad_exam.h b/swad_exam.h index 37faf73f..c75bc422 100644 --- a/swad_exam.h +++ b/swad_exam.h @@ -68,7 +68,7 @@ void Exa_ReqCreatOrEditExam (void); void Exa_PutFormsOneExam (struct Exa_Exams *Exams, Exa_ExistingNewExam_t ExistingNewExam); -void Exa_ReceiveFormExam (void); +void Exa_ReceiveExam (void); bool Exa_CheckIfEditable (const struct Exa_Exam *Exam); diff --git a/swad_exam_session.c b/swad_exam_session.c index 6d6a504e..6096eb69 100644 --- a/swad_exam_session.c +++ b/swad_exam_session.c @@ -412,7 +412,7 @@ static void ExaSes_ListOneOrMoreSessionsIcons (struct Exa_Exams *Exams, const struct ExaSes_Session *Session, const char *Anchor) { - static const Act_Action_t ActionHideUnhide[HidVis_NUM_HIDDEN_VISIBLE] = + static Act_Action_t ActionHideUnhide[HidVis_NUM_HIDDEN_VISIBLE] = { [HidVis_HIDDEN ] = ActUnhExaSes, // Hidden ==> action to unhide [HidVis_VISIBLE] = ActHidExaSes, // Visible ==> action to hide @@ -1083,7 +1083,7 @@ void ExaSes_ReqCreatOrEditSes (void) /****************** Create a new exam session (by a teacher) *****************/ /*****************************************************************************/ -void ExaSes_ReceiveFormSession (void) +void ExaSes_ReceiveSession (void) { extern const char *Txt_Created_new_session_X; extern const char *Txt_The_session_has_been_modified; diff --git a/swad_exam_session.h b/swad_exam_session.h index 87ed2d1f..27916de7 100644 --- a/swad_exam_session.h +++ b/swad_exam_session.h @@ -67,7 +67,7 @@ void ExaSes_GetAndCheckPars (struct Exa_Exams *Exams, struct ExaSes_Session *Session); void ExaSes_ReqCreatOrEditSes (void); -void ExaSes_ReceiveFormSession (void); +void ExaSes_ReceiveSession (void); bool ExaSes_CheckIfICanAnswerThisSession (const struct Exa_Exam *Exam, const struct ExaSes_Session *Session); diff --git a/swad_exam_set.c b/swad_exam_set.c index 81ce3e90..7236e7b2 100644 --- a/swad_exam_set.c +++ b/swad_exam_set.c @@ -233,7 +233,7 @@ static void ExaSet_PutFormNewSet (struct Exa_Exams *Exams, /**************** Receive form to create a new set of questions **************/ /*****************************************************************************/ -void ExaSet_ReceiveFormSet (void) +void ExaSet_ReceiveSet (void) { struct Exa_Exams Exams; struct ExaSet_Set Set; diff --git a/swad_exam_set.h b/swad_exam_set.h index 5a6f6b87..9318eec7 100644 --- a/swad_exam_set.h +++ b/swad_exam_set.h @@ -39,7 +39,7 @@ void ExaSet_PutParsOneSet (void *Exams); void ExaSet_GetSetDataByCod (struct ExaSet_Set *Set); -void ExaSet_ReceiveFormSet (void); +void ExaSet_ReceiveSet (void); void ExaSet_ChangeSetTitle (void); void ExaSet_ChangeNumQstsToExam (void); diff --git a/swad_file_MIME.c b/swad_file_MIME.c index 7d78a90d..d3aa1949 100644 --- a/swad_file_MIME.c +++ b/swad_file_MIME.c @@ -238,8 +238,8 @@ const char *MIM_MIMETypesAllowed[] = "zz-application/zz-winassoc-mpp" // Microsoft Project mpp }; -const unsigned MIM_NUM_MIME_TYPES_ALLOWED = sizeof (MIM_MIMETypesAllowed) / - sizeof (MIM_MIMETypesAllowed[0]); +unsigned MIM_NUM_MIME_TYPES_ALLOWED = sizeof (MIM_MIMETypesAllowed) / + sizeof (MIM_MIMETypesAllowed[0]); /*****************************************************************************/ /******** Check if MIME type is allowed **********/ diff --git a/swad_file_extension.c b/swad_file_extension.c index 4202cc85..d9b6e7c4 100644 --- a/swad_file_extension.c +++ b/swad_file_extension.c @@ -151,8 +151,8 @@ const char *Ext_FileExtensionsAllowed[] = "zip" , }; -const unsigned Ext_NUM_FILE_EXT_ALLOWED = sizeof (Ext_FileExtensionsAllowed) / - sizeof (Ext_FileExtensionsAllowed[0]); +unsigned Ext_NUM_FILE_EXT_ALLOWED = sizeof (Ext_FileExtensionsAllowed) / + sizeof (Ext_FileExtensionsAllowed[0]); /*****************************************************************************/ /******************* Check if file extension is allowed **********************/ diff --git a/swad_forum.c b/swad_forum.c index 70b6aab1..0444eda9 100644 --- a/swad_forum.c +++ b/swad_forum.c @@ -74,7 +74,7 @@ extern struct Globals Gbl; /************************ Public constants and types *************************/ /*****************************************************************************/ -const Act_Action_t For_ActionsSeeFor[For_NUM_TYPES_FORUM] = +Act_Action_t For_ActionsSeeFor[For_NUM_TYPES_FORUM] = { [For_FORUM_COURSE_USRS] = ActSeeForCrsUsr, [For_FORUM_COURSE_TCHS] = ActSeeForCrsTch, @@ -91,7 +91,7 @@ const Act_Action_t For_ActionsSeeFor[For_NUM_TYPES_FORUM] = [For_FORUM_UNKNOWN ] = ActSeeFor, }; -const Act_Action_t For_ActionsSeePstFor[For_NUM_TYPES_FORUM] = +Act_Action_t For_ActionsSeePstFor[For_NUM_TYPES_FORUM] = { [For_FORUM_COURSE_USRS] = ActSeePstForCrsUsr, [For_FORUM_COURSE_TCHS] = ActSeePstForCrsTch, @@ -108,7 +108,7 @@ const Act_Action_t For_ActionsSeePstFor[For_NUM_TYPES_FORUM] = [For_FORUM_UNKNOWN ] = ActSeeFor, }; -const Act_Action_t For_ActionsRecThrFor[For_NUM_TYPES_FORUM] = +Act_Action_t For_ActionsRecThrFor[For_NUM_TYPES_FORUM] = { [For_FORUM_COURSE_USRS] = ActRcvThrForCrsUsr, [For_FORUM_COURSE_TCHS] = ActRcvThrForCrsTch, @@ -125,7 +125,7 @@ const Act_Action_t For_ActionsRecThrFor[For_NUM_TYPES_FORUM] = [For_FORUM_UNKNOWN ] = ActSeeFor, }; -const Act_Action_t For_ActionsRecRepFor[For_NUM_TYPES_FORUM] = +Act_Action_t For_ActionsRecRepFor[For_NUM_TYPES_FORUM] = { [For_FORUM_COURSE_USRS] = ActRcvRepForCrsUsr, [For_FORUM_COURSE_TCHS] = ActRcvRepForCrsTch, @@ -142,7 +142,7 @@ const Act_Action_t For_ActionsRecRepFor[For_NUM_TYPES_FORUM] = [For_FORUM_UNKNOWN ] = ActSeeFor, }; -const Act_Action_t For_ActionsReqDelThr[For_NUM_TYPES_FORUM] = +Act_Action_t For_ActionsReqDelThr[For_NUM_TYPES_FORUM] = { [For_FORUM_COURSE_USRS] = ActReqDelThrCrsUsr, [For_FORUM_COURSE_TCHS] = ActReqDelThrCrsTch, @@ -159,7 +159,7 @@ const Act_Action_t For_ActionsReqDelThr[For_NUM_TYPES_FORUM] = [For_FORUM_UNKNOWN ] = ActSeeFor, }; -const Act_Action_t For_ActionsDelThrFor[For_NUM_TYPES_FORUM] = +Act_Action_t For_ActionsDelThrFor[For_NUM_TYPES_FORUM] = { [For_FORUM_COURSE_USRS] = ActDelThrForCrsUsr, [For_FORUM_COURSE_TCHS] = ActDelThrForCrsTch, @@ -176,7 +176,7 @@ const Act_Action_t For_ActionsDelThrFor[For_NUM_TYPES_FORUM] = [For_FORUM_UNKNOWN ] = ActSeeFor, }; -const Act_Action_t For_ActionsCutThrFor[For_NUM_TYPES_FORUM] = +Act_Action_t For_ActionsCutThrFor[For_NUM_TYPES_FORUM] = { [For_FORUM_COURSE_USRS] = ActCutThrForCrsUsr, [For_FORUM_COURSE_TCHS] = ActCutThrForCrsTch, @@ -193,7 +193,7 @@ const Act_Action_t For_ActionsCutThrFor[For_NUM_TYPES_FORUM] = [For_FORUM_UNKNOWN ] = ActSeeFor, }; -const Act_Action_t For_ActionsPasThrFor[For_NUM_TYPES_FORUM] = +Act_Action_t For_ActionsPasThrFor[For_NUM_TYPES_FORUM] = { [For_FORUM_COURSE_USRS] = ActPasThrForCrsUsr, [For_FORUM_COURSE_TCHS] = ActPasThrForCrsTch, @@ -210,7 +210,7 @@ const Act_Action_t For_ActionsPasThrFor[For_NUM_TYPES_FORUM] = [For_FORUM_UNKNOWN ] = ActSeeFor, }; -const Act_Action_t For_ActionsDelPstFor[For_NUM_TYPES_FORUM] = +Act_Action_t For_ActionsDelPstFor[For_NUM_TYPES_FORUM] = { [For_FORUM_COURSE_USRS] = ActDelPstForCrsUsr, [For_FORUM_COURSE_TCHS] = ActDelPstForCrsTch, @@ -227,7 +227,7 @@ const Act_Action_t For_ActionsDelPstFor[For_NUM_TYPES_FORUM] = [For_FORUM_UNKNOWN ] = ActSeeFor, }; -const Act_Action_t For_ActionsEnbPstFor[For_NUM_TYPES_FORUM] = +Act_Action_t For_ActionsEnbPstFor[For_NUM_TYPES_FORUM] = { [For_FORUM_COURSE_USRS] = ActEnbPstForCrsUsr, [For_FORUM_COURSE_TCHS] = ActEnbPstForCrsTch, @@ -244,7 +244,7 @@ const Act_Action_t For_ActionsEnbPstFor[For_NUM_TYPES_FORUM] = [For_FORUM_UNKNOWN ] = ActSeeFor, }; -const Act_Action_t For_ActionsDisPstFor[For_NUM_TYPES_FORUM] = +Act_Action_t For_ActionsDisPstFor[For_NUM_TYPES_FORUM] = { [For_FORUM_COURSE_USRS] = ActDisPstForCrsUsr, [For_FORUM_COURSE_TCHS] = ActDisPstForCrsTch, @@ -267,7 +267,7 @@ const Act_Action_t For_ActionsDisPstFor[For_NUM_TYPES_FORUM] = #define For_FORUM_MAX_LEVELS 5 -static const unsigned PermissionThreadDeletion[For_NUM_TYPES_FORUM] = +static unsigned PermissionThreadDeletion[For_NUM_TYPES_FORUM] = { [For_FORUM_COURSE_USRS] = 0x3F0, [For_FORUM_COURSE_TCHS] = 0x3F0, diff --git a/swad_game.c b/swad_game.c index 882ff8bb..24e8542c 100644 --- a/swad_game.c +++ b/swad_game.c @@ -379,7 +379,7 @@ static bool Gam_CheckIfICanListGameQuestions (void) static void Gam_PutIconsListingGames (void *Games) { - static const Act_Action_t NextAction[Rol_NUM_ROLES] = + static Act_Action_t NextAction[Rol_NUM_ROLES] = { [Rol_STD ] = ActSeeMyMchResCrs, [Rol_NET ] = ActReqSeeUsrMchRes, @@ -716,12 +716,12 @@ static void Gam_PutParGameOrder (Gam_Order_t SelectedOrder) static void Gam_PutIconsToRemEditOneGame (struct Gam_Games *Games, const char *Anchor) { - static const Act_Action_t ActionHideUnhide[HidVis_NUM_HIDDEN_VISIBLE] = + static Act_Action_t ActionHideUnhide[HidVis_NUM_HIDDEN_VISIBLE] = { [HidVis_HIDDEN ] = ActUnhGam, // Hidden ==> action to unhide [HidVis_VISIBLE] = ActHidGam, // Visible ==> action to hide }; - static const Act_Action_t ActionShowResults[Rol_NUM_ROLES] = + static Act_Action_t ActionShowResults[Rol_NUM_ROLES] = { [Rol_STD ] = ActSeeMyMchResGam, [Rol_NET ] = ActSeeUsrMchResGam, @@ -1324,7 +1324,7 @@ static void Gam_PutFormEditionGame (struct Gam_Games *Games, extern const char *Txt_Description; extern const char *Txt_Save_changes; extern const char *Txt_Create; - static const Act_Action_t NextAction[] = + static Act_Action_t NextAction[] = { [Gam_EXISTING_GAME] = ActChgGam, [Gam_NEW_GAME ] = ActNewGam, @@ -1426,7 +1426,7 @@ static void Gam_PutFormEditionGame (struct Gam_Games *Games, /********************** Receive form to create a new game ********************/ /*****************************************************************************/ -void Gam_ReceiveFormGame (void) +void Gam_ReceiveGame (void) { struct Gam_Games Games; Gam_ExistingNewGame_t ExistingNewGame; diff --git a/swad_game.h b/swad_game.h index 0a2828d5..ca54c37e 100644 --- a/swad_game.h +++ b/swad_game.h @@ -140,7 +140,7 @@ void Gam_ListGame (void); void Gam_ReqCreatOrEditGame (void); void Gam_PutFormsOneGame (struct Gam_Games *Games, Gam_ExistingNewGame_t ExistingNewGame); -void Gam_ReceiveFormGame (void); +void Gam_ReceiveGame (void); void Gam_ReqSelectQstsToAddToGame (void); void Gam_ListQstsToAddToGame (void); diff --git a/swad_global.c b/swad_global.c index 2fabd9d9..f835f2c8 100644 --- a/swad_global.c +++ b/swad_global.c @@ -72,7 +72,7 @@ struct Globals Gbl; // All the global parameters and variables must be in this s void Gbl_InitializeGlobals (void) { - extern const unsigned Txt_Current_CGI_SWAD_Language; + extern unsigned Txt_Current_CGI_SWAD_Language; Rol_Role_t Role; Gbl.Layout.WritingHTMLStart = diff --git a/swad_group.c b/swad_group.c index 703f679b..5ccddc50 100644 --- a/swad_group.c +++ b/swad_group.c @@ -3204,7 +3204,7 @@ void Grp_GetNamesGrpsUsrBelongsTo (long UsrCod,long GrpTypCod,char *GroupNames) /****************** Receive form to create a new group type ******************/ /*****************************************************************************/ -void Grp_ReceiveFormNewGrpTyp (void) +void Grp_ReceiveNewGrpTyp (void) { extern const char *Txt_The_type_of_group_X_already_exists; extern const char *Txt_Created_new_type_of_group_X; @@ -3276,7 +3276,7 @@ static bool Grp_CheckIfOpenTimeInTheFuture (time_t OpenTimeUTC) /******************** Receive form to create a new group *********************/ /*****************************************************************************/ -void Grp_ReceiveFormNewGrp (void) +void Grp_ReceiveNewGrp (void) { extern const char *Txt_The_group_X_already_exists; extern const char *Txt_Created_new_group_X; diff --git a/swad_group.h b/swad_group.h index 42fbcac5..14ad2353 100644 --- a/swad_group.h +++ b/swad_group.h @@ -206,8 +206,8 @@ bool Grp_CheckIfUsrSharesAnyOfMyGrpsInCurrentCrs (const struct Usr_Data *UsrDat) void Grp_GetLstCodGrpsWithFileZonesIBelong (struct ListCodGrps *LstGrps); void Grp_GetNamesGrpsUsrBelongsTo (long UsrCod,long GrpTypCod,char *GroupNames); -void Grp_ReceiveFormNewGrpTyp (void); -void Grp_ReceiveFormNewGrp (void); +void Grp_ReceiveNewGrpTyp (void); +void Grp_ReceiveNewGrp (void); void Grp_ReqRemGroupType (void); void Grp_ReqRemGroup (void); void Grp_RemoveGroupType (void); diff --git a/swad_help.c b/swad_help.c index 2edbaf4e..a4ede764 100644 --- a/swad_help.c +++ b/swad_help.c @@ -86,7 +86,7 @@ void Hlp_ShowHelpWhatWouldYouLikeToDo (void) extern const char *Txt_Log_in; extern const char *Txt_New_on_PLATFORM_Sign_up; extern const char *Txt_Actions[ActLst_NUM_ACTIONS]; - static const Act_Action_t ActionsRemoveMe[Rol_NUM_ROLES] = + static Act_Action_t ActionsRemoveMe[Rol_NUM_ROLES] = { [Rol_UNK ] = ActUnk, [Rol_GST ] = ActUnk, diff --git a/swad_hierarchy_config.c b/swad_hierarchy_config.c index 7d518c30..f167a7d1 100644 --- a/swad_hierarchy_config.c +++ b/swad_hierarchy_config.c @@ -91,7 +91,7 @@ void HieCfg_Name (Frm_PutForm_t PutForm,Hie_Level_t Level, extern const char *Nam_Classes[Nam_NUM_SHRT_FULL_NAMES]; extern const char *Txt_Short_name; extern const char *Txt_HIERARCHY_SINGUL_Abc[Hie_NUM_LEVELS]; - static const Act_Action_t Action[Hie_NUM_LEVELS][Nam_NUM_SHRT_FULL_NAMES] = + static Act_Action_t Action[Hie_NUM_LEVELS][Nam_NUM_SHRT_FULL_NAMES] = { [Hie_INS][Nam_SHRT_NAME] = ActRenInsShoCfg, [Hie_INS][Nam_FULL_NAME] = ActRenInsFulCfg, diff --git a/swad_holiday.c b/swad_holiday.c index 5a73be22..71895a8d 100644 --- a/swad_holiday.c +++ b/swad_holiday.c @@ -1007,7 +1007,7 @@ static void Hld_PutHeadHolidays (void) /******************* Receive form to create a new holiday ********************/ /*****************************************************************************/ -void Hld_ReceiveFormNewHoliday (void) +void Hld_ReceiveNewHoliday (void) { extern const char *Txt_Created_new_holiday_X; extern const char *Txt_You_must_specify_the_name; diff --git a/swad_holiday.h b/swad_holiday.h index 15383fe7..2e005aff 100644 --- a/swad_holiday.h +++ b/swad_holiday.h @@ -97,6 +97,6 @@ void Hld_ChangeStartDate (void); void Hld_ChangeEndDate (void); void Hld_RenameHoliday (void); void Hld_ContEditAfterChgHld (void); -void Hld_ReceiveFormNewHoliday (void); +void Hld_ReceiveNewHoliday (void); #endif diff --git a/swad_icon.c b/swad_icon.c index 04c00339..585c8810 100644 --- a/swad_icon.c +++ b/swad_icon.c @@ -311,7 +311,7 @@ void Ico_PutContextualIconToConfigure (Act_Action_t NextAction,const char *Ancho "cog.svg",Ico_BLACK); } -void Ico_PutContextualIconToHideUnhide (const Act_Action_t NextAction[HidVis_NUM_HIDDEN_VISIBLE], +void Ico_PutContextualIconToHideUnhide (Act_Action_t NextAction[HidVis_NUM_HIDDEN_VISIBLE], const char *Anchor, void (*FuncPars) (void *Args),void *Args, HidVis_HiddenOrVisible_t HiddenOrVisible) @@ -322,7 +322,7 @@ void Ico_PutContextualIconToHideUnhide (const Act_Action_t NextAction[HidVis_NUM Ico_HiddenVisible[HiddenOrVisible].Color); } -void Ico_PutContextualIconToExpand (const Act_Action_t NextAction,const char *Anchor, +void Ico_PutContextualIconToExpand (Act_Action_t NextAction,const char *Anchor, void (*FuncPars) (void *Args),void *Args) { Lay_PutContextualLinkOnlyIcon (NextAction,Anchor, @@ -330,7 +330,7 @@ void Ico_PutContextualIconToExpand (const Act_Action_t NextAction,const char *An "caret-right.svg",Ico_BLACK); } -void Ico_PutContextualIconToContract (const Act_Action_t NextAction,const char *Anchor, +void Ico_PutContextualIconToContract (Act_Action_t NextAction,const char *Anchor, void (*FuncPars) (void *Args),void *Args) { Lay_PutContextualLinkOnlyIcon (NextAction,Anchor, diff --git a/swad_icon.h b/swad_icon.h index 0a7f2649..1066a051 100644 --- a/swad_icon.h +++ b/swad_icon.h @@ -93,13 +93,13 @@ void Ico_PutContextualIconToView (Act_Action_t NextAction,const char *Anchor, void (*FuncPars) (void *Args),void *Args); void Ico_PutContextualIconToConfigure (Act_Action_t NextAction,const char *Anchor, void (*FuncPars) (void *Args),void *Args); -void Ico_PutContextualIconToHideUnhide (const Act_Action_t NextAction[HidVis_NUM_HIDDEN_VISIBLE], +void Ico_PutContextualIconToHideUnhide (Act_Action_t NextAction[HidVis_NUM_HIDDEN_VISIBLE], const char *Anchor, void (*FuncPars) (void *Args),void *Args, HidVis_HiddenOrVisible_t HiddenOrVisible); -void Ico_PutContextualIconToExpand (const Act_Action_t NextAction,const char *Anchor, +void Ico_PutContextualIconToExpand (Act_Action_t NextAction,const char *Anchor, void (*FuncPars) (void *Args),void *Args); -void Ico_PutContextualIconToContract (const Act_Action_t NextAction,const char *Anchor, +void Ico_PutContextualIconToContract (Act_Action_t NextAction,const char *Anchor, void (*FuncPars) (void *Args),void *Args); void Ico_PutContextualIconToPrint (Act_Action_t NextAction, void (*FuncPars) (void *Args),void *Args); diff --git a/swad_info.c b/swad_info.c index ab082432..cf898382 100644 --- a/swad_info.c +++ b/swad_info.c @@ -60,7 +60,7 @@ extern struct Globals Gbl; static const char *Inf_FileNamesForInfoType[Inf_NUM_TYPES] = { - [Inf_INTRODUCTION ] = Cfg_CRS_INFO_INTRODUCTION, + [Inf_INFORMATION ] = Cfg_CRS_INFO_INFORMATION, [Inf_TEACHING_GUIDE] = Cfg_CRS_INFO_TEACHING_GUIDE, [Inf_LECTURES ] = Cfg_CRS_INFO_LECTURES, [Inf_PRACTICALS ] = Cfg_CRS_INFO_PRACTICALS, @@ -70,9 +70,9 @@ static const char *Inf_FileNamesForInfoType[Inf_NUM_TYPES] = [Inf_ASSESSMENT ] = Cfg_CRS_INFO_ASSESSMENT, }; -static const Act_Action_t Inf_ActionsInfo[Inf_NUM_SOURCES][Inf_NUM_TYPES] = +static Act_Action_t Inf_ActionsInfo[Inf_NUM_SOURCES][Inf_NUM_TYPES] = { - [Inf_NONE ][Inf_INTRODUCTION ] = ActUnk, + [Inf_NONE ][Inf_INFORMATION ] = ActUnk, [Inf_NONE ][Inf_TEACHING_GUIDE] = ActUnk, [Inf_NONE ][Inf_LECTURES ] = ActUnk, [Inf_NONE ][Inf_PRACTICALS ] = ActUnk, @@ -81,7 +81,7 @@ static const Act_Action_t Inf_ActionsInfo[Inf_NUM_SOURCES][Inf_NUM_TYPES] = [Inf_NONE ][Inf_LINKS ] = ActUnk, [Inf_NONE ][Inf_ASSESSMENT ] = ActUnk, - [Inf_EDITOR ][Inf_INTRODUCTION ] = ActEditorCrsInf, + [Inf_EDITOR ][Inf_INFORMATION ] = ActEditorCrsInf, [Inf_EDITOR ][Inf_TEACHING_GUIDE] = ActEditorTchGui, [Inf_EDITOR ][Inf_LECTURES ] = ActEditorSyl, [Inf_EDITOR ][Inf_PRACTICALS ] = ActEditorSyl, @@ -90,7 +90,7 @@ static const Act_Action_t Inf_ActionsInfo[Inf_NUM_SOURCES][Inf_NUM_TYPES] = [Inf_EDITOR ][Inf_LINKS ] = ActEditorCrsLnk, [Inf_EDITOR ][Inf_ASSESSMENT ] = ActEditorAss, - [Inf_PLAIN_TEXT][Inf_INTRODUCTION ] = ActPlaTxtEdiCrsInf, + [Inf_PLAIN_TEXT][Inf_INFORMATION ] = ActPlaTxtEdiCrsInf, [Inf_PLAIN_TEXT][Inf_TEACHING_GUIDE] = ActPlaTxtEdiTchGui, [Inf_PLAIN_TEXT][Inf_LECTURES ] = ActPlaTxtEdiSyl, [Inf_PLAIN_TEXT][Inf_PRACTICALS ] = ActPlaTxtEdiSyl, @@ -99,7 +99,7 @@ static const Act_Action_t Inf_ActionsInfo[Inf_NUM_SOURCES][Inf_NUM_TYPES] = [Inf_PLAIN_TEXT][Inf_LINKS ] = ActPlaTxtEdiCrsLnk, [Inf_PLAIN_TEXT][Inf_ASSESSMENT ] = ActPlaTxtEdiAss, - [Inf_RICH_TEXT ][Inf_INTRODUCTION ] = ActRchTxtEdiCrsInf, + [Inf_RICH_TEXT ][Inf_INFORMATION ] = ActRchTxtEdiCrsInf, [Inf_RICH_TEXT ][Inf_TEACHING_GUIDE] = ActRchTxtEdiTchGui, [Inf_RICH_TEXT ][Inf_LECTURES ] = ActRchTxtEdiSyl, [Inf_RICH_TEXT ][Inf_PRACTICALS ] = ActRchTxtEdiSyl, @@ -108,7 +108,7 @@ static const Act_Action_t Inf_ActionsInfo[Inf_NUM_SOURCES][Inf_NUM_TYPES] = [Inf_RICH_TEXT ][Inf_LINKS ] = ActRchTxtEdiCrsLnk, [Inf_RICH_TEXT ][Inf_ASSESSMENT ] = ActRchTxtEdiAss, - [Inf_PAGE ][Inf_INTRODUCTION ] = ActRcvPagCrsInf, + [Inf_PAGE ][Inf_INFORMATION ] = ActRcvPagCrsInf, [Inf_PAGE ][Inf_TEACHING_GUIDE] = ActRcvPagTchGui, [Inf_PAGE ][Inf_LECTURES ] = ActRcvPagSyl, [Inf_PAGE ][Inf_PRACTICALS ] = ActRcvPagSyl, @@ -117,7 +117,7 @@ static const Act_Action_t Inf_ActionsInfo[Inf_NUM_SOURCES][Inf_NUM_TYPES] = [Inf_PAGE ][Inf_LINKS ] = ActRcvPagCrsLnk, [Inf_PAGE ][Inf_ASSESSMENT ] = ActRcvPagAss, - [Inf_URL ][Inf_INTRODUCTION ] = ActRcvURLCrsInf, + [Inf_URL ][Inf_INFORMATION ] = ActRcvURLCrsInf, [Inf_URL ][Inf_TEACHING_GUIDE] = ActRcvURLTchGui, [Inf_URL ][Inf_LECTURES ] = ActRcvURLSyl, [Inf_URL ][Inf_PRACTICALS ] = ActRcvURLSyl, @@ -191,7 +191,7 @@ void Inf_ShowInfo (void) bool ShowWarningNoInfo = false; const char *Help[Inf_NUM_TYPES] = { - [Inf_INTRODUCTION ] = Hlp_COURSE_Information_textual_information, + [Inf_INFORMATION ] = Hlp_COURSE_Information_textual_information, [Inf_TEACHING_GUIDE] = Hlp_COURSE_Guide, [Inf_LECTURES ] = Hlp_COURSE_Syllabus, [Inf_PRACTICALS ] = Hlp_COURSE_Syllabus, @@ -265,7 +265,7 @@ void Inf_ShowInfo (void) case Inf_PRACTICALS: ShowWarningNoInfo = !Syl_CheckAndShowSyllabus (&Syllabus); break; - case Inf_INTRODUCTION: + case Inf_INFORMATION: case Inf_TEACHING_GUIDE: case Inf_BIBLIOGRAPHY: case Inf_FAQ: @@ -305,14 +305,9 @@ void Inf_ShowInfo (void) static void Inf_PutIconToViewInfo (void *Type) { extern Syl_WhichSyllabus_t Syl_WhichSyllabus[Syl_NUM_WHICH_SYLLABUS]; - static struct + static struct Act_ActionFunc Inf_Actions[Inf_NUM_TYPES] = { - const Act_Action_t NextAction; - void (*FuncPars) (void *Args); - void *Args; - } Inf_Actions[Inf_NUM_TYPES] = - { - [Inf_INTRODUCTION ] = {ActSeeCrsInf,NULL,NULL}, + [Inf_INFORMATION ] = {ActSeeCrsInf,NULL,NULL}, [Inf_TEACHING_GUIDE] = {ActSeeTchGui,NULL,NULL}, [Inf_LECTURES ] = {ActSeeSyl ,Syl_PutParWhichSyllabus,&Syl_WhichSyllabus[Syl_LECTURES ]}, [Inf_PRACTICALS ] = {ActSeeSyl ,Syl_PutParWhichSyllabus,&Syl_WhichSyllabus[Syl_PRACTICALS]}, @@ -331,14 +326,9 @@ static void Inf_PutIconToViewInfo (void *Type) void Inf_PutIconToEditInfo (void *Type) { extern Syl_WhichSyllabus_t Syl_WhichSyllabus[Syl_NUM_WHICH_SYLLABUS]; - static struct + static struct Act_ActionFunc Inf_Actions[Inf_NUM_TYPES] = { - const Act_Action_t NextAction; - void (*FuncPars) (void *Args); - void *Args; - } Inf_Actions[Inf_NUM_TYPES] = - { - [Inf_INTRODUCTION ] = {ActEdiCrsInf,NULL,NULL}, + [Inf_INFORMATION ] = {ActEdiCrsInf,NULL,NULL}, [Inf_TEACHING_GUIDE] = {ActEdiTchGui,NULL,NULL}, [Inf_LECTURES ] = {ActEdiSyl ,Syl_PutParWhichSyllabus,&Syl_WhichSyllabus[Syl_LECTURES ]}, [Inf_PRACTICALS ] = {ActEdiSyl ,Syl_PutParWhichSyllabus,&Syl_WhichSyllabus[Syl_PRACTICALS]}, @@ -362,14 +352,9 @@ static void Inf_PutCheckboxForceStdsToReadInfo (bool MustBeRead,bool Disabled) { extern Syl_WhichSyllabus_t Syl_WhichSyllabus[Syl_NUM_WHICH_SYLLABUS]; extern const char *Txt_Force_students_to_read_this_information; - static struct + static struct Act_ActionFunc Inf_Actions[Inf_NUM_TYPES] = { - const Act_Action_t NextAction; - void (*FuncPars) (void *Args); - void *Args; - } Inf_Actions[Inf_NUM_TYPES] = - { - [Inf_INTRODUCTION ] = {ActChgFrcReaCrsInf,NULL,NULL}, + [Inf_INFORMATION ] = {ActChgFrcReaCrsInf,NULL,NULL}, [Inf_TEACHING_GUIDE] = {ActChgFrcReaTchGui,NULL,NULL}, [Inf_LECTURES ] = {ActChgFrcReaSyl ,Syl_PutParWhichSyllabus,&Syl_WhichSyllabus[Syl_LECTURES ]}, [Inf_PRACTICALS ] = {ActChgFrcReaSyl ,Syl_PutParWhichSyllabus,&Syl_WhichSyllabus[Syl_PRACTICALS]}, @@ -396,14 +381,9 @@ static void Inf_PutCheckboxConfirmIHaveReadInfo (void) { extern Syl_WhichSyllabus_t Syl_WhichSyllabus[Syl_NUM_WHICH_SYLLABUS]; extern const char *Txt_I_have_read_this_information; - static struct + static struct Act_ActionFunc Inf_Actions[Inf_NUM_TYPES] = { - const Act_Action_t NextAction; - void (*FuncPars) (void *Args); - void *Args; - } Inf_Actions[Inf_NUM_TYPES] = - { - [Inf_INTRODUCTION ] = {ActChgHavReaCrsInf,NULL,NULL}, + [Inf_INFORMATION ] = {ActChgHavReaCrsInf,NULL,NULL}, [Inf_TEACHING_GUIDE] = {ActChgHavReaTchGui,NULL,NULL}, [Inf_LECTURES ] = {ActChgHavReaSyl ,Syl_PutParWhichSyllabus,&Syl_WhichSyllabus[Syl_LECTURES ]}, [Inf_PRACTICALS ] = {ActChgHavReaSyl ,Syl_PutParWhichSyllabus,&Syl_WhichSyllabus[Syl_PRACTICALS]}, @@ -472,14 +452,9 @@ void Inf_WriteMsgYouMustReadInfo (void) extern Syl_WhichSyllabus_t Syl_WhichSyllabus[Syl_NUM_WHICH_SYLLABUS]; extern const char *Txt_Required_reading; extern const char *Txt_You_should_read_the_following_information; - static struct + static struct Act_ActionFunc Inf_Actions[Inf_NUM_TYPES] = { - const Act_Action_t NextAction; - void (*FuncPars) (void *Args); - void *Args; - } Inf_Actions[Inf_NUM_TYPES] = - { - [Inf_INTRODUCTION ] = {ActSeeCrsInf,NULL,NULL}, + [Inf_INFORMATION ] = {ActSeeCrsInf,NULL,NULL}, [Inf_TEACHING_GUIDE] = {ActSeeTchGui,NULL,NULL}, [Inf_LECTURES ] = {ActSeeSyl ,Syl_PutParWhichSyllabus,&Syl_WhichSyllabus[Syl_LECTURES ]}, [Inf_PRACTICALS ] = {ActSeeSyl ,Syl_PutParWhichSyllabus,&Syl_WhichSyllabus[Syl_PRACTICALS]}, @@ -840,9 +815,9 @@ void Inf_FormsToSelSendInfo (void) struct Inf_FromDB FromDB; Inf_Src_t InfoSrc; bool InfoAvailable[Inf_NUM_SOURCES]; - static const Act_Action_t Inf_ActionsSelecInfoSrc[Inf_NUM_TYPES] = + static Act_Action_t Inf_ActionsSelecInfoSrc[Inf_NUM_TYPES] = { - [Inf_INTRODUCTION ] = ActSelInfSrcCrsInf, + [Inf_INFORMATION ] = ActSelInfSrcCrsInf, [Inf_TEACHING_GUIDE] = ActSelInfSrcTchGui, [Inf_LECTURES ] = ActSelInfSrcSyl, [Inf_PRACTICALS ] = ActSelInfSrcSyl, @@ -863,7 +838,7 @@ void Inf_FormsToSelSendInfo (void) }; const char *HelpEdit[Inf_NUM_TYPES] = { - [Inf_INTRODUCTION ] = Hlp_COURSE_Information_edit, + [Inf_INFORMATION ] = Hlp_COURSE_Information_edit, [Inf_TEACHING_GUIDE] = Hlp_COURSE_Guide_edit, [Inf_LECTURES ] = Hlp_COURSE_Syllabus_edit, [Inf_PRACTICALS ] = Hlp_COURSE_Syllabus_edit, @@ -1128,7 +1103,7 @@ static void Inf_AsignInfoType (struct Inf_Info *Info, switch (Act_GetSuperAction (Gbl.Action.Act)) { case ActSeeCrsInf: - Info->Type = Inf_INTRODUCTION; + Info->Type = Inf_INFORMATION; break; case ActSeeTchGui: Info->Type = Inf_TEACHING_GUIDE; @@ -1247,7 +1222,7 @@ void Inf_GetAndCheckInfoSrcFromDB (struct Syl_Syllabus *Syllabus, if (!Syl_CheckSyllabus (Syllabus,CrsCod)) FromDB->Src = Inf_NONE; break; - case Inf_INTRODUCTION: + case Inf_INFORMATION: case Inf_TEACHING_GUIDE: case Inf_BIBLIOGRAPHY: case Inf_FAQ: @@ -1348,9 +1323,15 @@ static bool Inf_CheckAndShowPlainTxt (void) if (TxtHTML[0]) { - if (Gbl.Crs.Info.Type == Inf_INTRODUCTION || - Gbl.Crs.Info.Type == Inf_TEACHING_GUIDE) - Lay_WriteHeaderClassPhoto (Vie_VIEW); + switch (Gbl.Crs.Info.Type) + { + case Inf_INFORMATION: + case Inf_TEACHING_GUIDE: + Lay_WriteHeaderClassPhoto (Vie_VIEW); + break; + default: + break; + } HTM_DIV_Begin ("class=\"LM DAT_%s\"",The_GetSuffix ()); @@ -1413,9 +1394,15 @@ static bool Inf_CheckAndShowRichTxt (void) if (TxtMD[0]) { - if (Gbl.Crs.Info.Type == Inf_INTRODUCTION || - Gbl.Crs.Info.Type == Inf_TEACHING_GUIDE) - Lay_WriteHeaderClassPhoto (Vie_VIEW); + switch (Gbl.Crs.Info.Type) + { + case Inf_INFORMATION: + case Inf_TEACHING_GUIDE: + Lay_WriteHeaderClassPhoto (Vie_VIEW); + break; + default: + break; + } HTM_DIV_Begin ("id=\"crs_info\" class=\"LM CRS_INFO_%s\"", The_GetSuffix ()); @@ -1510,14 +1497,9 @@ void Inf_EditPlainTxtInfo (void) extern const char *Txt_Save_changes; struct Syl_Syllabus Syllabus; char TxtHTML[Cns_MAX_BYTES_LONG_TEXT + 1]; - static struct + static struct Act_ActionFunc Inf_Actions[Inf_NUM_TYPES] = { - const Act_Action_t NextAction; - void (*FuncPars) (void *Args); - void *Args; - } Inf_Actions[Inf_NUM_TYPES] = - { - [Inf_INTRODUCTION ] = {ActRcvPlaTxtCrsInf,NULL,NULL}, + [Inf_INFORMATION ] = {ActRcvPlaTxtCrsInf,NULL,NULL}, [Inf_TEACHING_GUIDE] = {ActRcvPlaTxtTchGui,NULL,NULL}, [Inf_LECTURES ] = {ActRcvPlaTxtSyl ,Syl_PutParWhichSyllabus,&Syl_WhichSyllabus[Syl_LECTURES ]}, [Inf_PRACTICALS ] = {ActRcvPlaTxtSyl ,Syl_PutParWhichSyllabus,&Syl_WhichSyllabus[Syl_PRACTICALS]}, @@ -1528,7 +1510,7 @@ void Inf_EditPlainTxtInfo (void) }; const char *HelpEdit[Inf_NUM_TYPES] = { - [Inf_INTRODUCTION ] = Hlp_COURSE_Information_edit, + [Inf_INFORMATION ] = Hlp_COURSE_Information_edit, [Inf_TEACHING_GUIDE] = Hlp_COURSE_Guide_edit, [Inf_LECTURES ] = Hlp_COURSE_Syllabus_edit, [Inf_PRACTICALS ] = Hlp_COURSE_Syllabus_edit, @@ -1551,9 +1533,15 @@ void Inf_EditPlainTxtInfo (void) Box_BoxBegin (Txt_INFO_TITLE[Gbl.Crs.Info.Type],NULL,NULL, HelpEdit[Gbl.Crs.Info.Type],Box_NOT_CLOSABLE); - if (Gbl.Crs.Info.Type == Inf_INTRODUCTION || - Gbl.Crs.Info.Type == Inf_TEACHING_GUIDE) - Lay_WriteHeaderClassPhoto (Vie_VIEW); + switch (Gbl.Crs.Info.Type) + { + case Inf_INFORMATION: + case Inf_TEACHING_GUIDE: + Lay_WriteHeaderClassPhoto (Vie_VIEW); + break; + default: + break; + } /***** Get info text from database *****/ Inf_GetInfoTxtFromDB (Gbl.Hierarchy.Node[Hie_CRS].HieCod,Gbl.Crs.Info.Type, @@ -1585,14 +1573,9 @@ void Inf_EditRichTxtInfo (void) extern const char *Txt_Save_changes; struct Syl_Syllabus Syllabus; char TxtHTML[Cns_MAX_BYTES_LONG_TEXT + 1]; - static struct + static struct Act_ActionFunc Inf_Actions[Inf_NUM_TYPES] = { - const Act_Action_t NextAction; - void (*FuncPars) (void *Args); - void *Args; - } Inf_Actions[Inf_NUM_TYPES] = - { - [Inf_INTRODUCTION ] = {ActRcvRchTxtCrsInf,NULL,NULL}, + [Inf_INFORMATION ] = {ActRcvRchTxtCrsInf,NULL,NULL}, [Inf_TEACHING_GUIDE] = {ActRcvRchTxtTchGui,NULL,NULL}, [Inf_LECTURES ] = {ActRcvRchTxtSyl ,Syl_PutParWhichSyllabus,&Syl_WhichSyllabus[Syl_LECTURES ]}, [Inf_PRACTICALS ] = {ActRcvRchTxtSyl ,Syl_PutParWhichSyllabus,&Syl_WhichSyllabus[Syl_PRACTICALS]}, @@ -1603,7 +1586,7 @@ void Inf_EditRichTxtInfo (void) }; const char *HelpEdit[Inf_NUM_TYPES] = { - [Inf_INTRODUCTION ] = Hlp_COURSE_Information_edit, + [Inf_INFORMATION ] = Hlp_COURSE_Information_edit, [Inf_TEACHING_GUIDE] = Hlp_COURSE_Guide_edit, [Inf_LECTURES ] = Hlp_COURSE_Syllabus_edit, [Inf_PRACTICALS ] = Hlp_COURSE_Syllabus_edit, @@ -1626,9 +1609,15 @@ void Inf_EditRichTxtInfo (void) Box_BoxBegin (Txt_INFO_TITLE[Gbl.Crs.Info.Type],NULL,NULL, HelpEdit[Gbl.Crs.Info.Type],Box_NOT_CLOSABLE); - if (Gbl.Crs.Info.Type == Inf_INTRODUCTION || - Gbl.Crs.Info.Type == Inf_TEACHING_GUIDE) - Lay_WriteHeaderClassPhoto (Vie_VIEW); + switch (Gbl.Crs.Info.Type) + { + case Inf_INFORMATION: + case Inf_TEACHING_GUIDE: + Lay_WriteHeaderClassPhoto (Vie_VIEW); + break; + default: + break; + } /***** Get info text from database *****/ Inf_GetInfoTxtFromDB (Gbl.Hierarchy.Node[Hie_CRS].HieCod,Gbl.Crs.Info.Type, diff --git a/swad_info.h b/swad_info.h index 69e18e64..e47f8d3b 100644 --- a/swad_info.h +++ b/swad_info.h @@ -39,7 +39,7 @@ #define Inf_NUM_TYPES 8 typedef enum { - Inf_INTRODUCTION = 0, + Inf_INFORMATION = 0, Inf_TEACHING_GUIDE = 1, Inf_LECTURES = 2, Inf_PRACTICALS = 3, diff --git a/swad_info_database.c b/swad_info_database.c index 37c2583a..f20e422b 100644 --- a/swad_info_database.c +++ b/swad_info_database.c @@ -42,14 +42,14 @@ extern struct Globals Gbl; static const char *Inf_DB_NamesForInfoType[Inf_NUM_TYPES] = { - [Inf_INTRODUCTION ] = "intro", // TODO: Change this to "introduction"! - [Inf_TEACHING_GUIDE] = "description", // TODO: Change this to "guide"! - [Inf_LECTURES ] = "theory", // TODO: Change this to "lectures"! - [Inf_PRACTICALS ] = "practices", // TODO: Change this to "practicals"! - [Inf_BIBLIOGRAPHY ] = "bibliography", - [Inf_FAQ ] = "FAQ", - [Inf_LINKS ] = "links", - [Inf_ASSESSMENT ] = "assessment", + [Inf_INFORMATION ] = "intro", // TODO: Change this to "inf" + [Inf_TEACHING_GUIDE] = "description", // TODO: Change this to "gui" + [Inf_LECTURES ] = "theory", // TODO: Change this to "lec" + [Inf_PRACTICALS ] = "practices", // TODO: Change this to "pra" + [Inf_BIBLIOGRAPHY ] = "bibliography", // TODO: Change this to "bib" + [Inf_FAQ ] = "FAQ", // TODO: Change this to "faq" + [Inf_LINKS ] = "links", // TODO: Change this to "lnk" + [Inf_ASSESSMENT ] = "assessment", // TODO: Change this to "ass" }; static const char *Inf_DB_NamesForInfoSrc[Inf_NUM_SOURCES] = diff --git a/swad_institution.c b/swad_institution.c index 750ee884..3fba411f 100644 --- a/swad_institution.c +++ b/swad_institution.c @@ -97,7 +97,7 @@ static void Ins_ShowAlertAndButtonToGoToIns (void); static void Ins_PutFormToCreateInstitution (void); static void Ins_PutHeadInstitutionsForEdition (void); -static void Ins_ReceiveFormRequestOrCreateIns (Hie_Status_t Status); +static void Ins_ReceiveRequestOrCreateIns (Hie_Status_t Status); static void Ins_EditingInstitutionConstructor (); static void Ins_EditingInstitutionDestructor (); @@ -875,7 +875,7 @@ void Ins_WriteSelectorOfInstitution (void) static void Ins_ListInstitutionsForEdition (void) { extern const char *Txt_INSTITUTION_STATUS[Hie_NUM_STATUS_TXT]; - static const Act_Action_t ActionRename[Nam_NUM_SHRT_FULL_NAMES] = + static Act_Action_t ActionRename[Nam_NUM_SHRT_FULL_NAMES] = { [Nam_SHRT_NAME] = ActRenInsSho, [Nam_FULL_NAME] = ActRenInsFul, @@ -1431,33 +1431,33 @@ static void Ins_PutHeadInstitutionsForEdition (void) /*************** Receive form to request a new institution *******************/ /*****************************************************************************/ -void Ins_ReceiveFormReqIns (void) +void Ins_ReceiveReqIns (void) { /***** Institution constructor *****/ Ins_EditingInstitutionConstructor (); /***** Receive form to request a new institution *****/ - Ins_ReceiveFormRequestOrCreateIns ((Hie_Status_t) Hie_STATUS_BIT_PENDING); + Ins_ReceiveRequestOrCreateIns ((Hie_Status_t) Hie_STATUS_BIT_PENDING); } /*****************************************************************************/ /***************** Receive form to create a new institution ******************/ /*****************************************************************************/ -void Ins_ReceiveFormNewIns (void) +void Ins_ReceiveNewIns (void) { /***** Institution constructor *****/ Ins_EditingInstitutionConstructor (); /***** Receive form to create a new institution *****/ - Ins_ReceiveFormRequestOrCreateIns ((Hie_Status_t) 0); + Ins_ReceiveRequestOrCreateIns ((Hie_Status_t) 0); } /*****************************************************************************/ /*********** Receive form to request or create a new institution *************/ /*****************************************************************************/ -static void Ins_ReceiveFormRequestOrCreateIns (Hie_Status_t Status) +static void Ins_ReceiveRequestOrCreateIns (Hie_Status_t Status) { extern const char *Txt_Created_new_institution_X; char *Names[Nam_NUM_SHRT_FULL_NAMES]; diff --git a/swad_institution.h b/swad_institution.h index 7d9395a7..95f9865f 100644 --- a/swad_institution.h +++ b/swad_institution.h @@ -64,8 +64,8 @@ void Ins_ChangeInsWWW (void); void Ins_ChangeInsStatus (void); void Ins_ContEditAfterChgIns (void); -void Ins_ReceiveFormReqIns (void); -void Ins_ReceiveFormNewIns (void); +void Ins_ReceiveReqIns (void); +void Ins_ReceiveNewIns (void); unsigned Ins_GetCachedNumInssWithUsrs (Rol_Role_t Role); diff --git a/swad_language.c b/swad_language.c index d6cdded5..cbafaa2f 100644 --- a/swad_language.c +++ b/swad_language.c @@ -220,7 +220,7 @@ void Lan_UpdateMyLanguageToCurrentLanguage (void) Lan_Language_t Lan_GetParLanguage (void) { - extern const unsigned Txt_Current_CGI_SWAD_Language; + extern unsigned Txt_Current_CGI_SWAD_Language; return (Lan_Language_t) Par_GetParUnsignedLong ("Lan", diff --git a/swad_layout.c b/swad_layout.c index d7712927..9e90731d 100644 --- a/swad_layout.c +++ b/swad_layout.c @@ -117,7 +117,7 @@ static void Lay_HelpTextEditor (const char *Text,const char *InlineMath,const ch void Lay_WriteStartOfPage (void) { extern const char *Lan_STR_LANG_ID[1 + Lan_NUM_LANGUAGES]; - extern const unsigned Txt_Current_CGI_SWAD_Language; + extern unsigned Txt_Current_CGI_SWAD_Language; static const char *LayoutMainZone[Mnu_NUM_MENUS] = { [Mnu_MENU_HORIZONTAL] = "main_horizontal", diff --git a/swad_link.c b/swad_link.c index 3157ac3c..864246ae 100644 --- a/swad_link.c +++ b/swad_link.c @@ -395,7 +395,7 @@ static void Lnk_FreeListLinks (struct Lnk_Links *Links) static void Lnk_ListLinksForEdition (const struct Lnk_Links *Links) { - static const Act_Action_t ActionRename[Nam_NUM_SHRT_FULL_NAMES] = + static Act_Action_t ActionRename[Nam_NUM_SHRT_FULL_NAMES] = { [Nam_SHRT_NAME] = ActRenLnkSho, [Nam_FULL_NAME] = ActRenLnkFul, @@ -707,7 +707,7 @@ static void Lnk_PutHeadLinks (void) /******************* Receive form to create a new link ***********************/ /*****************************************************************************/ -void Lnk_ReceiveFormNewLink (void) +void Lnk_ReceiveNewLink (void) { extern const char *Txt_You_must_specify_the_web_address; extern const char *Txt_Created_new_link_X; diff --git a/swad_link.h b/swad_link.h index d3b1b416..0d63bb64 100644 --- a/swad_link.h +++ b/swad_link.h @@ -52,6 +52,6 @@ void Lnk_RenameLinkShort (void); void Lnk_RenameLinkFull (void); void Lnk_ChangeLinkWWW (void); void Lnk_ContEditAfterChgLnk (void); -void Lnk_ReceiveFormNewLink (void); +void Lnk_ReceiveNewLink (void); #endif diff --git a/swad_logo.c b/swad_logo.c index da2d9038..fe611e33 100644 --- a/swad_logo.c +++ b/swad_logo.c @@ -196,15 +196,15 @@ void Lgo_DrawLogo (Hie_Level_t Level,const struct Hie_Node *Node, void Lgo_PutIconToChangeLogo (Hie_Level_t Level) { - static const Act_Action_t Action[Hie_NUM_LEVELS] = + static Act_Action_t Action[Hie_NUM_LEVELS] = { - [Hie_UNK] = ActUnk, // Unknown - [Hie_SYS] = ActUnk, // System - [Hie_CTY] = ActUnk, // Country - [Hie_INS] = ActReqInsLog, // Institution - [Hie_CTR] = ActReqCtrLog, // Center - [Hie_DEG] = ActReqDegLog, // Degree - [Hie_CRS] = ActUnk, // Course + [Hie_UNK] = ActUnk, + [Hie_SYS] = ActUnk, + [Hie_CTY] = ActUnk, + [Hie_INS] = ActReqInsLog, + [Hie_CTR] = ActReqCtrLog, + [Hie_DEG] = ActReqDegLog, + [Hie_CRS] = ActUnk, }; Lay_PutContextualLinkOnlyIcon (Action[Level],NULL, @@ -221,7 +221,7 @@ void Lgo_RequestLogo (Hie_Level_t Level) extern const char *Txt_Logo; extern const char *Txt_You_can_send_a_file_with_an_image_in_PNG_format_transparent_background_and_size_X_Y; extern const char *Txt_File_with_the_logo; - static const Act_Action_t ActionRec[Hie_NUM_LEVELS] = + static Act_Action_t ActionRec[Hie_NUM_LEVELS] = { [Hie_INS] = ActRecInsLog, [Hie_CTR] = ActRecCtrLog, diff --git a/swad_mail.c b/swad_mail.c index b20b6ce3..57abab1a 100644 --- a/swad_mail.c +++ b/swad_mail.c @@ -733,7 +733,7 @@ static void Mai_PutHeadMailDomains (void) /******************* Receive form to create a new mail ***********************/ /*****************************************************************************/ -void Mai_ReceiveFormNewMailDomain (void) +void Mai_ReceiveNewMailDomain (void) { extern const char *Txt_The_email_domain_X_already_exists; extern const char *Txt_Created_new_email_domain_X; diff --git a/swad_mail.h b/swad_mail.h index 30f7f95f..be6aab1d 100644 --- a/swad_mail.h +++ b/swad_mail.h @@ -71,7 +71,7 @@ void Mai_RemoveMailDomain (void); void Mai_RenameMailDomainShort (void); void Mai_RenameMailDomainFull (void); void Mai_ContEditAfterChgMai (void); -void Mai_ReceiveFormNewMailDomain (void); +void Mai_ReceiveNewMailDomain (void); void Mai_ReqUsrsToListEmails (void); void Mai_GetSelUsrsAndListEmails (void); diff --git a/swad_message.c b/swad_message.c index 6b6794e7..62b6e604 100644 --- a/swad_message.c +++ b/swad_message.c @@ -1430,13 +1430,13 @@ static void Msg_ShowSntOrRcvMessages (struct Msg_Messages *Messages) unsigned NumUnreadMsgs; struct Pag_Pagination Pagination; long MsgCod; - static const Act_Action_t ActionSee[Msg_NUM_TYPES_OF_MSGS] = + static Act_Action_t ActionSee[Msg_NUM_TYPES_OF_MSGS] = { [Msg_WRITING ] = ActUnk, [Msg_RECEIVED] = ActSeeRcvMsg, [Msg_SENT ] = ActSeeSntMsg, }; - static const Pag_WhatPaginate_t WhatPaginate[Msg_NUM_TYPES_OF_MSGS] = + static Pag_WhatPaginate_t WhatPaginate[Msg_NUM_TYPES_OF_MSGS] = { [Msg_WRITING ] = Pag_NONE, [Msg_RECEIVED] = Pag_MESSAGES_RECEIVED, @@ -1674,7 +1674,7 @@ static void Msg_SetNumMsgsStr (const struct Msg_Messages *Messages, static void Msg_PutIconsListMsgs (void *Messages) { - static const Act_Action_t ActionReqDelAllMsg[Msg_NUM_TYPES_OF_MSGS] = + static Act_Action_t ActionReqDelAllMsg[Msg_NUM_TYPES_OF_MSGS] = { [Msg_WRITING ] = ActUnk, [Msg_RECEIVED] = ActReqDelAllRcvMsg, @@ -2000,7 +2000,7 @@ static void Msg_ShowASentOrReceivedMessage (struct Msg_Messages *Messages, extern const char *Txt_MSG_From; extern const char *Txt_MSG_To; extern const char *Txt_MSG_Content; - static const Act_Action_t ActionDelMsg[Msg_NUM_TYPES_OF_MSGS] = + static Act_Action_t ActionDelMsg[Msg_NUM_TYPES_OF_MSGS] = { [Msg_WRITING ] = ActUnk, [Msg_RECEIVED] = ActDelRcvMsg, @@ -2452,7 +2452,7 @@ static void Msg_WriteMsgTo (struct Msg_Messages *Messages,long MsgCod) extern const char *Txt_and_X_other_recipients; extern const char *Txt_unknown_recipient; extern const char *Txt_unknown_recipients; - static const Act_Action_t ActionSee[Msg_NUM_TYPES_OF_MSGS] = + static Act_Action_t ActionSee[Msg_NUM_TYPES_OF_MSGS] = { [Msg_WRITING ] = ActUnk, [Msg_RECEIVED] = ActSeeRcvMsg, diff --git a/swad_name.c b/swad_name.c index f95c3329..a3b947f4 100644 --- a/swad_name.c +++ b/swad_name.c @@ -103,7 +103,7 @@ void Nam_NewShortAndFullNames (const char *Names[Nam_NUM_SHRT_FULL_NAMES]) } } -void Nam_ExistingShortAndFullNames (const Act_Action_t ActionRename[Nam_NUM_SHRT_FULL_NAMES], +void Nam_ExistingShortAndFullNames (Act_Action_t ActionRename[Nam_NUM_SHRT_FULL_NAMES], ParCod_Param_t ParCod,long Cod, const char *Names[Nam_NUM_SHRT_FULL_NAMES], Frm_PutForm_t PutForm) diff --git a/swad_name.h b/swad_name.h index 84e5630d..73ccd2ef 100644 --- a/swad_name.h +++ b/swad_name.h @@ -62,7 +62,7 @@ void Nam_GetParsShrtAndFullName (char *Names[Nam_NUM_SHRT_FULL_NAMES]); void Nam_GetParShrtOrFullName (Nam_ShrtOrFullName_t ShrtOrFull,char *Name); void Nam_NewShortAndFullNames (const char *Names[Nam_NUM_SHRT_FULL_NAMES]); -void Nam_ExistingShortAndFullNames (const Act_Action_t ActionRename[Nam_NUM_SHRT_FULL_NAMES], +void Nam_ExistingShortAndFullNames (Act_Action_t ActionRename[Nam_NUM_SHRT_FULL_NAMES], ParCod_Param_t ParCod,long Cod, const char *Names[Nam_NUM_SHRT_FULL_NAMES], Frm_PutForm_t PutForm); diff --git a/swad_notice.c b/swad_notice.c index 70d61dfc..135e17ab 100644 --- a/swad_notice.c +++ b/swad_notice.c @@ -66,7 +66,7 @@ extern struct Globals Gbl; #define Not_MAX_CHARS_ON_NOTICE 40 // Maximum number of characters in notices (when not expanded) -static const unsigned Not_MaxCharsURLOnScreen[Not_NUM_TYPES_LISTING] = +static unsigned Not_MaxCharsURLOnScreen[Not_NUM_TYPES_LISTING] = { [Not_LIST_BRIEF_NOTICES] = 15, [Not_LIST_FULL_NOTICES ] = 50, @@ -206,7 +206,7 @@ void Not_GetHighLightedNotCod (void) /***************** Mark as hidden a notice that was active *******************/ /*****************************************************************************/ -void Not_HideActiveNotice (void) +void Not_HideNotice (void) { long NotCod; @@ -227,7 +227,7 @@ void Not_HideActiveNotice (void) /****************** Mark as active a notice that was hidden ******************/ /*****************************************************************************/ -void Not_RevealHiddenNotice (void) +void Not_UnhideNotice (void) { long NotCod; @@ -508,7 +508,7 @@ static void Not_DrawANotice (Not_Listing_t TypeNoticesListing, Lay_Highlight_t Highlight) { extern const char *Txt_See_full_notice; - static const Act_Action_t ActionHideUnhide[HidVis_NUM_HIDDEN_VISIBLE] = + static Act_Action_t ActionHideUnhide[HidVis_NUM_HIDDEN_VISIBLE] = { [HidVis_HIDDEN ] = ActUnhNot, // Hidden ==> action to unhide [HidVis_VISIBLE] = ActHidNot, // Visible ==> action to hide diff --git a/swad_notice.h b/swad_notice.h index 53fa156c..13dcd337 100644 --- a/swad_notice.h +++ b/swad_notice.h @@ -67,8 +67,8 @@ void Not_ListNoticesAfterRemoval (void); void Not_ListFullNotices (void); void Not_GetHighLightedNotCod (void); -void Not_HideActiveNotice (void); -void Not_RevealHiddenNotice (void); +void Not_HideNotice (void); +void Not_UnhideNotice (void); void Not_ReqRemNotice (void); void Not_RemoveNotice (void); diff --git a/swad_notification.c b/swad_notification.c index 235b1514..24d2d58f 100644 --- a/swad_notification.c +++ b/swad_notification.c @@ -123,7 +123,7 @@ const char *Ntf_WSNotifyEvents[Ntf_NUM_NOTIFY_EVENTS] = /* Profile tab */ }; -static const Act_Action_t Ntf_DefaultActions[Ntf_NUM_NOTIFY_EVENTS] = +static Act_Action_t Ntf_DefaultActions[Ntf_NUM_NOTIFY_EVENTS] = { [Ntf_EVENT_UNKNOWN ] = ActUnk, /* Start tab */ @@ -777,7 +777,7 @@ static Act_Action_t Ntf_StartFormGoToAction (Ntf_NotifyEvent_t NotifyEvent, long CrsCod,const struct Usr_Data *UsrDat,long Cod, const struct For_Forums *Forums) { - extern const Act_Action_t For_ActionsSeeFor[For_NUM_TYPES_FORUM]; + extern Act_Action_t For_ActionsSeeFor[For_NUM_TYPES_FORUM]; struct Brw_FileMetadata FileMetadata; long InsCod = -1L; long CtrCod = -1L; diff --git a/swad_pagination.c b/swad_pagination.c index af548a10..78dd7075 100644 --- a/swad_pagination.c +++ b/swad_pagination.c @@ -55,8 +55,8 @@ /*****************************************************************************/ extern struct Globals Gbl; -extern const Act_Action_t For_ActionsSeeFor[For_NUM_TYPES_FORUM]; -extern const Act_Action_t For_ActionsSeePstFor[For_NUM_TYPES_FORUM]; +extern Act_Action_t For_ActionsSeeFor[For_NUM_TYPES_FORUM]; +extern Act_Action_t For_ActionsSeePstFor[For_NUM_TYPES_FORUM]; /*****************************************************************************/ /***************************** Private constants *****************************/ diff --git a/swad_parameter.c b/swad_parameter.c index 05e70e3e..dd4e3fb6 100644 --- a/swad_parameter.c +++ b/swad_parameter.c @@ -833,6 +833,8 @@ void Par_GetMainPars (void) case ActSndNewPwd: Usr_GetParUsrIdLogin (); break; + default: + break; } /***** Try to get settings changed from current IP *****/ diff --git a/swad_password.c b/swad_password.c index fab19e1b..83ab3e09 100644 --- a/swad_password.c +++ b/swad_password.c @@ -726,7 +726,7 @@ void Pwd_ShowFormChgOtherUsrPwd (void) { extern const char *Txt_Password; extern const char *Txt_Change_password; - static const Act_Action_t NextAction[Rol_NUM_ROLES] = + static Act_Action_t NextAction[Rol_NUM_ROLES] = { [Rol_UNK ] = ActChgPwdOth, [Rol_GST ] = ActChgPwdOth, diff --git a/swad_photo.c b/swad_photo.c index 93740919..0cf8c57f 100644 --- a/swad_photo.c +++ b/swad_photo.c @@ -174,7 +174,7 @@ bool Pho_ICanChangeOtherUsrPhoto (struct Usr_Data *UsrDat) void Pho_PutIconToChangeUsrPhoto (struct Usr_Data *UsrDat) { - static const Act_Action_t NextAction[Rol_NUM_ROLES] = + static Act_Action_t NextAction[Rol_NUM_ROLES] = { [Rol_UNK ] = ActReqOthPho, [Rol_GST ] = ActReqOthPho, @@ -226,7 +226,7 @@ static void Pho_PutIconToReqRemOtherUsrPhoto (__attribute__((unused)) void *Args { char PhotoURL[Cns_MAX_BYTES_WWW + 1]; bool PhotoExists; - static const Act_Action_t NextAction[Rol_NUM_ROLES] = + static Act_Action_t NextAction[Rol_NUM_ROLES] = { [Rol_UNK ] = ActReqRemOthPho, [Rol_GST ] = ActReqRemOthPho, @@ -286,7 +286,7 @@ static void Pho_ReqPhoto (const struct Usr_Data *UsrDat) extern const char *Txt_Photo; extern const char *Txt_You_can_send_a_file_with_an_image_in_JPEG_format_; extern const char *Txt_File_with_the_photo; - static const Act_Action_t NextAction[Rol_NUM_ROLES] = + static Act_Action_t NextAction[Rol_NUM_ROLES] = { [Rol_UNK ] = ActDetOthPho, [Rol_GST ] = ActDetOthPho, @@ -491,7 +491,7 @@ void Pho_ReqRemUsrPhoto (void) extern const char *Txt_Do_you_really_want_to_remove_the_photo_of_X; extern const char *Txt_Remove; extern const char *Txt_The_photo_no_longer_exists; - static const Act_Action_t NextAction[Rol_NUM_ROLES] = + static Act_Action_t NextAction[Rol_NUM_ROLES] = { [Rol_UNK ] = ActRemOthPho, [Rol_GST ] = ActRemOthPho, @@ -620,7 +620,7 @@ static bool Pho_ReceivePhotoAndDetectFaces (Usr_MeOrOther_t MeOrOther, unsigned Radius; unsigned BackgroundCode; char StrFileName[NAME_MAX + 1]; - static const Act_Action_t NextAction[Rol_NUM_ROLES] = + static Act_Action_t NextAction[Rol_NUM_ROLES] = { [Rol_UNK ] = ActChgOthPho, [Rol_GST ] = ActChgOthPho, diff --git a/swad_place.c b/swad_place.c index a73ed51a..f75ff545 100644 --- a/swad_place.c +++ b/swad_place.c @@ -423,7 +423,7 @@ void Plc_FreeListPlaces (struct Plc_Places *Places) static void Plc_ListPlacesForEdition (const struct Plc_Places *Places) { - static const Act_Action_t ActionRename[Nam_NUM_SHRT_FULL_NAMES] = + static Act_Action_t ActionRename[Nam_NUM_SHRT_FULL_NAMES] = { [Nam_SHRT_NAME] = ActRenPlcSho, [Nam_FULL_NAME] = ActRenPlcFul, @@ -692,7 +692,7 @@ static void Plc_PutHeadPlaces (void) /******************* Receive form to create a new place **********************/ /*****************************************************************************/ -void Plc_ReceiveFormNewPlace (void) +void Plc_ReceiveNewPlace (void) { extern const char *Txt_Created_new_place_X; char *Names[Nam_NUM_SHRT_FULL_NAMES]; diff --git a/swad_place.h b/swad_place.h index fbf9ca6f..39769e4d 100644 --- a/swad_place.h +++ b/swad_place.h @@ -74,6 +74,6 @@ void Plc_RenamePlaceShort (void); void Plc_RenamePlaceFull (void); void Plc_ContEditAfterChgPlc (void); -void Plc_ReceiveFormNewPlace (void); +void Plc_ReceiveNewPlace (void); #endif diff --git a/swad_plugin.c b/swad_plugin.c index 5a8ea9a5..2a174c6b 100644 --- a/swad_plugin.c +++ b/swad_plugin.c @@ -901,7 +901,7 @@ static void Plg_PutHeadPlugins (void) /****************** Receive form to create a new plugin **********************/ /*****************************************************************************/ -void Plg_ReceiveFormNewPlg (void) +void Plg_ReceiveNewPlg (void) { extern const char *Txt_The_plugin_X_already_exists; extern const char *Txt_Created_new_plugin_X; diff --git a/swad_plugin.h b/swad_plugin.h index 86ee1053..bdb9b4f0 100644 --- a/swad_plugin.h +++ b/swad_plugin.h @@ -76,6 +76,6 @@ void Plg_ChangePlgURL (void); void Plg_ChangePlgIP (void); void Plg_ContEditAfterChgPlg (void); -void Plg_ReceiveFormNewPlg (void); +void Plg_ReceiveNewPlg (void); #endif diff --git a/swad_program.c b/swad_program.c index 5e572fb5..0a643408 100644 --- a/swad_program.c +++ b/swad_program.c @@ -621,14 +621,14 @@ static void Prg_PutIconToContractOrExpandItem (struct Prg_Item *Item, ConExp_ContractedOrExpanded_t ContractedOrExpanded, Vie_ViewType_t ViewType) { - static const Act_Action_t NextAction[ConExp_NUM_CONTRACTED_EXPANDED][Vie_NUM_VIEW_TYPES] = + static Act_Action_t NextAction[ConExp_NUM_CONTRACTED_EXPANDED][Vie_NUM_VIEW_TYPES] = { [ConExp_CONTRACTED][Vie_VIEW] = ActExpSeePrgItm, // Contracted, Not editing ==> action to expand [ConExp_CONTRACTED][Vie_EDIT] = ActExpEdiPrgItm, // Contracted, Editing ==> action to expand [ConExp_EXPANDED ][Vie_VIEW] = ActConSeePrgItm, // Expanded , Not editing ==> action to contract [ConExp_EXPANDED ][Vie_EDIT] = ActConEdiPrgItm, // Expanded , Editing ==> action to contract }; - static void (*PutContextualIcon[ConExp_NUM_CONTRACTED_EXPANDED]) (const Act_Action_t NextAction,const char *Anchor, + static void (*PutContextualIcon[ConExp_NUM_CONTRACTED_EXPANDED]) (Act_Action_t NextAction,const char *Anchor, void (*FuncPars) (void *Args),void *Args) = { [ConExp_CONTRACTED] = Ico_PutContextualIconToExpand, // Contracted ==> function to expand @@ -934,7 +934,7 @@ static void Prg_PutFormsToRemEditOneItem (Prg_ListingType_t ListingType, bool HighlightItem) { extern const char *Txt_Movement_not_allowed; - static const Act_Action_t ActionHideUnhide[HidVis_NUM_HIDDEN_VISIBLE] = + static Act_Action_t ActionHideUnhide[HidVis_NUM_HIDDEN_VISIBLE] = { [HidVis_HIDDEN ] = ActUnhPrgItm, // Hidden ==> action to unhide [HidVis_VISIBLE] = ActHidPrgItm, // Visible ==> action to hide @@ -2002,7 +2002,7 @@ static void Prg_ShowFormItem (const struct Prg_Item *Item, /************* Receive form to change an existing program item ***************/ /*****************************************************************************/ -void Prg_ReceiveFormChgItem (void) +void Prg_ReceiveChgItem (void) { struct Prg_Item Item; char Description[Cns_MAX_BYTES_TEXT + 1]; @@ -2045,7 +2045,7 @@ void Prg_ReceiveFormChgItem (void) /***************** Receive form to create a new program item *****************/ /*****************************************************************************/ -void Prg_ReceiveFormNewItem (void) +void Prg_ReceiveNewItem (void) { struct Prg_Item Item; // Parent item struct Prg_Item NewItem; // Item data received from form diff --git a/swad_program.h b/swad_program.h index 6abb64c3..9d8fdc62 100644 --- a/swad_program.h +++ b/swad_program.h @@ -140,8 +140,8 @@ unsigned Prg_GetLevelFromNumItem (unsigned NumItem); void Prg_ViewItemAfterEdit (void); void Prg_ReqChangeItem (void); void Prg_ReqCreateItem (void); -void Prg_ReceiveFormChgItem (void); -void Prg_ReceiveFormNewItem (void); +void Prg_ReceiveChgItem (void); +void Prg_ReceiveNewItem (void); void Prg_ReqRemItem (void); void Prg_RemoveItem (void); diff --git a/swad_program_resource.c b/swad_program_resource.c index a9023a47..5ff16107 100644 --- a/swad_program_resource.c +++ b/swad_program_resource.c @@ -536,7 +536,7 @@ static void PrgRsc_PutFormsToRemEditOneResource (struct Prg_Item *Item, unsigned NumRsc, unsigned NumResources) { - static const Act_Action_t ActionHideUnhide[HidVis_NUM_HIDDEN_VISIBLE] = + static Act_Action_t ActionHideUnhide[HidVis_NUM_HIDDEN_VISIBLE] = { [HidVis_HIDDEN ] = ActUnhPrgRsc, // Hidden ==> action to unhide [HidVis_VISIBLE] = ActHidPrgRsc, // Visible ==> action to hide diff --git a/swad_project.c b/swad_project.c index 81b486da..df7962fe 100644 --- a/swad_project.c +++ b/swad_project.c @@ -86,8 +86,8 @@ static const Prj_RoleInProject_t Prj_RolesToShow[] = Prj_ROLE_STD, // Student Prj_ROLE_EVL, // Evaluator }; -static const unsigned Prj_NUM_ROLES_TO_SHOW = sizeof (Prj_RolesToShow) / - sizeof (Prj_RolesToShow[0]); +static unsigned Prj_NUM_ROLES_TO_SHOW = sizeof (Prj_RolesToShow) / + sizeof (Prj_RolesToShow[0]); /***** Assigned/non-assigned project *****/ static const char *AssignedNonassigIcon[Prj_NUM_ASSIGNED_NONASSIG] = @@ -2007,14 +2007,14 @@ static void Prj_ShowProjectMembersWithARole (struct Prj_Projects *Projects, extern const char *HidVis_MsgClass[HidVis_NUM_HIDDEN_VISIBLE]; extern const char *Txt_PROJECT_ROLES_SINGUL_Abc[Prj_NUM_ROLES_IN_PROJECT]; extern const char *Txt_PROJECT_ROLES_PLURAL_Abc[Prj_NUM_ROLES_IN_PROJECT]; - static const Act_Action_t ActionReqRemUsr[Prj_NUM_ROLES_IN_PROJECT] = + static Act_Action_t ActionReqRemUsr[Prj_NUM_ROLES_IN_PROJECT] = { [Prj_ROLE_UNK] = ActUnk, // Unknown [Prj_ROLE_STD] = ActReqRemStdPrj, // Student [Prj_ROLE_TUT] = ActReqRemTutPrj, // Tutor [Prj_ROLE_EVL] = ActReqRemEvlPrj, // Evaluator }; - static const Act_Action_t ActionReqAddUsr[Prj_NUM_ROLES_IN_PROJECT] = + static Act_Action_t ActionReqAddUsr[Prj_NUM_ROLES_IN_PROJECT] = { [Prj_ROLE_UNK] = ActUnk, // Unknown [Prj_ROLE_STD] = ActReqAddStdPrj, // Student @@ -2855,7 +2855,7 @@ static void Prj_FormToSelectUsrs (struct Prj_Projects *Projects, extern const char *Hlp_ASSESSMENT_Projects_add_user; extern const char *Txt_Add_USERS; extern const char *Txt_PROJECT_ROLES_PLURAL_abc[Prj_NUM_ROLES_IN_PROJECT]; - static const Act_Action_t ActionAddUsr[Prj_NUM_ROLES_IN_PROJECT] = + static Act_Action_t ActionAddUsr[Prj_NUM_ROLES_IN_PROJECT] = { [Prj_ROLE_UNK] = ActUnk, // Unknown [Prj_ROLE_STD] = ActAddStdPrj, // Student @@ -3019,7 +3019,7 @@ static void Prj_ReqRemUsrFromPrj (struct Prj_Projects *Projects, extern const char *Txt_Do_you_really_want_to_remove_the_following_user_as_a_X_from_the_project_Y; extern const char *Txt_PROJECT_ROLES_SINGUL_abc[Prj_NUM_ROLES_IN_PROJECT][Usr_NUM_SEXS]; extern const char *Txt_Remove_USER_from_this_project; - static const Act_Action_t ActionRemUsr[Prj_NUM_ROLES_IN_PROJECT] = + static Act_Action_t ActionRemUsr[Prj_NUM_ROLES_IN_PROJECT] = { [Prj_ROLE_UNK] = ActUnk, // Unknown [Prj_ROLE_STD] = ActRemStdPrj, // Student @@ -3172,7 +3172,7 @@ static Prj_Order_t Prj_GetParPrjOrder (void) static void Prj_PutIconsToRemEditOnePrj (struct Prj_Projects *Projects, const char *Anchor) { - static const Act_Action_t ActionHideUnhide[HidVis_NUM_HIDDEN_VISIBLE] = + static Act_Action_t ActionHideUnhide[HidVis_NUM_HIDDEN_VISIBLE] = { [HidVis_HIDDEN ] = ActUnhPrj, // Hidden ==> action to unhide [HidVis_VISIBLE] = ActHidPrj, // Visible ==> action to hide @@ -3991,7 +3991,7 @@ void Prj_FreeMemProject (struct Prj_Project *Prj) /******************** Receive form to create a new project *******************/ /*****************************************************************************/ -void Prj_ReceiveFormProject (void) +void Prj_ReceiveProject (void) { extern const char *Txt_Created_new_project_X; extern const char *Txt_The_project_has_been_modified; diff --git a/swad_project.h b/swad_project.h index 0b6d10e7..3cfbaa2e 100644 --- a/swad_project.h +++ b/swad_project.h @@ -255,7 +255,7 @@ void Prj_RemoveProject (void); void Prj_HideProject (void); void Prj_UnhideProject (void); -void Prj_ReceiveFormProject (void); +void Prj_ReceiveProject (void); void Prj_ReqLockSelectedPrjsEdition (void); void Prj_ReqUnloSelectedPrjsEdition (void); diff --git a/swad_record.c b/swad_record.c index 52d83b08..cc987bd3 100644 --- a/swad_record.c +++ b/swad_record.c @@ -441,7 +441,7 @@ static void Rec_WriteHeadingRecordFields (void) /*************** Receive data from a form of record fields *******************/ /*****************************************************************************/ -void Rec_ReceiveFormField (void) +void Rec_ReceiveField (void) { extern const char *Txt_The_record_field_X_already_exists; @@ -2282,7 +2282,7 @@ static void Rec_PutIconsCommands (__attribute__((unused)) void *Args) Usr_MeOrOther_t MeOrOther = Usr_ItsMe (Rec_Record.UsrDat->UsrCod); bool ICanViewUsrProfile; bool RecipientHasBannedMe; - static const Act_Action_t NextAction[Rol_NUM_ROLES] = + static Act_Action_t NextAction[Rol_NUM_ROLES] = { [Rol_UNK ] = ActReqMdfOth, [Rol_GST ] = ActReqMdfOth, @@ -2295,32 +2295,32 @@ static void Rec_PutIconsCommands (__attribute__((unused)) void *Args) [Rol_INS_ADM] = ActReqMdfOth, [Rol_SYS_ADM] = ActReqMdfOth, }; - static const Act_Action_t ActSeeAgd[Usr_NUM_ME_OR_OTHER] = + static Act_Action_t ActSeeAgd[Usr_NUM_ME_OR_OTHER] = { [Usr_ME ] = ActSeeMyAgd, [Usr_OTHER] = ActSeeUsrAgd, }; - static const Act_Action_t ActSeeTstResCrs[Usr_NUM_ME_OR_OTHER] = + static Act_Action_t ActSeeTstResCrs[Usr_NUM_ME_OR_OTHER] = { [Usr_ME ] = ActSeeMyTstResCrs, [Usr_OTHER] = ActSeeUsrTstResCrs, }; - static const Act_Action_t ActSeeExaResCrs[Usr_NUM_ME_OR_OTHER] = + static Act_Action_t ActSeeExaResCrs[Usr_NUM_ME_OR_OTHER] = { [Usr_ME ] = ActSeeMyExaResCrs, [Usr_OTHER] = ActSeeUsrExaResCrs, }; - static const Act_Action_t ActSeeMchResCrs[Usr_NUM_ME_OR_OTHER] = + static Act_Action_t ActSeeMchResCrs[Usr_NUM_ME_OR_OTHER] = { [Usr_ME ] = ActSeeMyMchResCrs, [Usr_OTHER] = ActSeeUsrMchResCrs, }; - static const Act_Action_t ActAdmAsgWrk[Usr_NUM_ME_OR_OTHER] = + static Act_Action_t ActAdmAsgWrk[Usr_NUM_ME_OR_OTHER] = { [Usr_ME ] = ActAdmAsgWrkUsr, [Usr_OTHER] = ActAdmAsgWrkCrs, // Not me, I am not a student in current course }; - static const Act_Action_t ActSeeLstAtt[Usr_NUM_ME_OR_OTHER] = + static Act_Action_t ActSeeLstAtt[Usr_NUM_ME_OR_OTHER] = { [Usr_ME ] = ActSeeLstMyAtt, [Usr_OTHER] = ActSeeLstUsrAtt, @@ -2477,14 +2477,14 @@ void Rec_PutParUsrCodEncrypted (__attribute__((unused)) void *Args) static void Rec_PutParsMyResults (__attribute__((unused)) void *Args) { - Dat_SetIniEndDatesToPastAndNow (); + Dat_SetDatesToPastAndNow (); Dat_WriteParsIniEndDates (); } static void Rec_PutParsStdResults (__attribute__((unused)) void *Args) { Rec_PutParsStudent (NULL); - Dat_SetIniEndDatesToPastAndNow (); + Dat_SetDatesToPastAndNow (); Dat_WriteParsIniEndDates (); } diff --git a/swad_record.h b/swad_record.h index ccf4875f..bb0e76b7 100644 --- a/swad_record.h +++ b/swad_record.h @@ -117,7 +117,7 @@ struct LstRecordFields void Rec_ReqEditRecordFields (void); void Rec_GetListRecordFieldsInCurrentCrs (void); void Rec_ShowFormCreateRecordField (void); -void Rec_ReceiveFormField (void); +void Rec_ReceiveField (void); unsigned Rec_ConvertToNumLinesField (const char *StrNumLines); bool Rec_CheckIfRecordFieldIsRepeated (const char *FldName); void Rec_CreateRecordField (void); diff --git a/swad_room.c b/swad_room.c index c3bc89fe..7c6354a8 100644 --- a/swad_room.c +++ b/swad_room.c @@ -626,7 +626,7 @@ void Roo_FreeListRooms (struct Roo_Rooms *Rooms) static void Roo_ListRoomsForEdition (const struct Bld_Buildings *Buildings, const struct Roo_Rooms *Rooms) { - static const Act_Action_t ActionRename[Nam_NUM_SHRT_FULL_NAMES] = + static Act_Action_t ActionRename[Nam_NUM_SHRT_FULL_NAMES] = { [Nam_SHRT_NAME] = ActRenRooSho, [Nam_FULL_NAME] = ActRenRooFul, @@ -1293,7 +1293,7 @@ static void Roo_PutHeadRooms (void) /******************* Receive form to create a new room ***********************/ /*****************************************************************************/ -void Roo_ReceiveFormNewRoom (void) +void Roo_ReceiveNewRoom (void) { extern const char *Txt_Created_new_room_X; char *Names[Nam_NUM_SHRT_FULL_NAMES]; diff --git a/swad_room.h b/swad_room.h index 55d860df..fce6d1da 100644 --- a/swad_room.h +++ b/swad_room.h @@ -132,6 +132,6 @@ void Roo_RenameRoomFull (void); void Roo_ChangeCapacity (void); void Roo_ContEditAfterChgRoom (void); -void Roo_ReceiveFormNewRoom (void); +void Roo_ReceiveNewRoom (void); #endif diff --git a/swad_rubric.c b/swad_rubric.c index c8112865..ecc1f34e 100644 --- a/swad_rubric.c +++ b/swad_rubric.c @@ -831,7 +831,7 @@ static void Rub_PutFormEditionRubric (struct Rub_Rubrics *Rubrics, extern const char *Txt_Description; extern const char *Txt_Create; extern const char *Txt_Save_changes; - static const Act_Action_t NextAction[] = + static Act_Action_t NextAction[] = { [Rub_EXISTING_RUBRIC] = ActChgRub, [Rub_NEW_RUBRIC ] = ActNewRub, @@ -904,7 +904,7 @@ static void Rub_PutFormEditionRubric (struct Rub_Rubrics *Rubrics, /********************* Receive form to create a new rubric *******************/ /*****************************************************************************/ -void Rub_ReceiveFormRubric (void) +void Rub_ReceiveRubric (void) { struct Rub_Rubrics Rubrics; Rub_ExistingNewRubric_t ExistingNewRubric; diff --git a/swad_rubric.h b/swad_rubric.h index 98e80620..ed31cc37 100644 --- a/swad_rubric.h +++ b/swad_rubric.h @@ -77,7 +77,7 @@ void Rub_ReqCreatOrEditRubric (void); void Rub_PutFormsOneRubric (struct Rub_Rubrics *Rubrics, Rub_ExistingNewRubric_t ExistingNewRubric); -void Rub_ReceiveFormRubric (void); +void Rub_ReceiveRubric (void); //-------------------------------- Figures ------------------------------------ void Rub_GetAndShowRubricsStats (void); diff --git a/swad_rubric_criteria.c b/swad_rubric_criteria.c index fb9a5fd3..26135620 100644 --- a/swad_rubric_criteria.c +++ b/swad_rubric_criteria.c @@ -242,7 +242,7 @@ static void RubCri_PutFormNewCriterion (struct Rub_Rubrics *Rubrics, /**************** Receive form to create a new rubric criterion **************/ /*****************************************************************************/ -void RubCri_ReceiveFormCriterion (void) +void RubCri_ReceiveCriterion (void) { struct Rub_Rubrics Rubrics; @@ -655,7 +655,7 @@ static void RubCri_ListOneOrMoreCriteriaForEdition (struct Rub_Rubrics *Rubrics, extern const char *Txt_Criteria; extern const char *Txt_Movement_not_allowed; // Actions to change minimum/maximum criterion values - static const Act_Action_t RubCri_ActionsValues[RubCri_NUM_VALUES] = + static Act_Action_t RubCri_ActionsValues[RubCri_NUM_VALUES] = { [RubCri_MIN] = ActChgMinRubCri, [RubCri_MAX] = ActChgMaxRubCri, diff --git a/swad_rubric_criteria.h b/swad_rubric_criteria.h index 919a5564..7409b0af 100644 --- a/swad_rubric_criteria.h +++ b/swad_rubric_criteria.h @@ -36,7 +36,7 @@ void RubCri_GetCriterionDataByCod (struct RubCri_Criterion *Criterion); -void RubCri_ReceiveFormCriterion (void); +void RubCri_ReceiveCriterion (void); void RubCri_ChangeTitle (void); void RubCri_ChangeMinValue (void); void RubCri_ChangeMaxValue (void); diff --git a/swad_statistic.c b/swad_statistic.c index a42990ac..1f668771 100644 --- a/swad_statistic.c +++ b/swad_statistic.c @@ -62,7 +62,7 @@ extern struct Globals Gbl; /***************************** Private constants *****************************/ /*****************************************************************************/ -static const unsigned Sta_CellPadding[Sta_NUM_CLICKS_GROUPED_BY] = +static unsigned Sta_CellPadding[Sta_NUM_CLICKS_GROUPED_BY] = { [Sta_CLICKS_CRS_DETAILED_LIST ] = 2, diff --git a/swad_survey.c b/swad_survey.c index bbc6e425..b46e4194 100644 --- a/swad_survey.c +++ b/swad_survey.c @@ -837,7 +837,7 @@ void Svy_PutParSvyOrder (Dat_StartEndTime_t SelectedOrder) static void Svy_PutFormsToRemEditOneSvy (struct Svy_Surveys *Surveys, const char *Anchor) { - static const Act_Action_t ActionHideUnhide[HidVis_NUM_HIDDEN_VISIBLE] = + static Act_Action_t ActionHideUnhide[HidVis_NUM_HIDDEN_VISIBLE] = { [HidVis_HIDDEN ] = ActUnhSvy, // Hidden ==> action to unhide [HidVis_VISIBLE] = ActHidSvy, // Visible ==> action to hide @@ -1873,7 +1873,7 @@ static void Svy_ShowLstGrpsToEditSurvey (long SvyCod) /********************* Receive form to create a new survey *******************/ /*****************************************************************************/ -void Svy_ReceiveFormSurvey (void) +void Svy_ReceiveSurvey (void) { extern const char *Txt_Already_existed_a_survey_with_the_title_X; struct Svy_Surveys Surveys; diff --git a/swad_survey.h b/swad_survey.h index a8901a31..6ac13deb 100644 --- a/swad_survey.h +++ b/swad_survey.h @@ -120,7 +120,7 @@ void Svy_AskResetSurvey (void); void Svy_ResetSurvey (void); void Svy_HideSurvey (void); void Svy_UnhideSurvey (void); -void Svy_ReceiveFormSurvey (void); +void Svy_ReceiveSurvey (void); void Svy_RemoveSurveys (Hie_Level_t Level,long Cod); void Svy_ReqEditQuestion (void); diff --git a/swad_syllabus.c b/swad_syllabus.c index 78e9b476..289bf119 100644 --- a/swad_syllabus.c +++ b/swad_syllabus.c @@ -503,9 +503,9 @@ static void Syl_ShowSyllabus (struct Syl_Syllabus *Syllabus) [Vie_VIEW] = 0, [Vie_EDIT] = 5, }; - static const Act_Action_t Inf_Actions[Inf_NUM_TYPES] = + static Act_Action_t Inf_Actions[Inf_NUM_TYPES] = { - [Inf_INTRODUCTION ] = ActSeeCrsInf, + [Inf_INFORMATION ] = ActSeeCrsInf, [Inf_TEACHING_GUIDE] = ActSeeTchGui, [Inf_LECTURES ] = ActSeeSyl, [Inf_PRACTICALS ] = ActSeeSyl, diff --git a/swad_test_print.c b/swad_test_print.c index d6709fad..4cbdb154 100644 --- a/swad_test_print.c +++ b/swad_test_print.c @@ -208,7 +208,7 @@ void TstPrn_ShowTestPrintToFillIt (struct TstPrn_Print *Print, extern const char *Txt_Send; unsigned QstInd; struct Qst_Question Question; - static const Act_Action_t Action[Tst_NUM_REQUEST_OR_CONFIRM] = + static Act_Action_t Action[Tst_NUM_REQUEST_OR_CONFIRM] = { [TstPrn_REQUEST] = ActReqAssTst, [TstPrn_CONFIRM] = ActAssTst, diff --git a/swad_text.c b/swad_text.c index abea9117..468fa2de 100644 --- a/swad_text.c +++ b/swad_text.c @@ -111,7 +111,7 @@ #define L 3 // English #endif -const unsigned Txt_Current_CGI_SWAD_Language = ((unsigned) L); +unsigned Txt_Current_CGI_SWAD_Language = ((unsigned) L); const char *Txt_NEW_LINE = "\r\n"; // End of line in a file. If we put only \n the file does not look good in some Windows text editors @@ -11256,7 +11256,7 @@ const char *Txt_EMAIL_DOMAIN_ORDER[Mai_NUM_ORDERS] = #elif L==5 // fr "Information" #elif L==6 // gn - "Información" // Okoteve traducción + "Marandu" #elif L==7 // it "Informazione" #elif L==8 // pl @@ -17313,7 +17313,7 @@ const char *Txt_Info = const char *Txt_INFO_TITLE[Inf_NUM_TYPES] = { - [Inf_INTRODUCTION] = + [Inf_INFORMATION] = #if L==1 // ca "Informació" #elif L==2 // de @@ -17325,7 +17325,7 @@ const char *Txt_INFO_TITLE[Inf_NUM_TYPES] = #elif L==5 // fr "Information" #elif L==6 // gn - "Información" // Okoteve traducción + "Marandu" #elif L==7 // it "Informazione" #elif L==8 // pl @@ -20354,7 +20354,7 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = #elif L==5 // fr "Information" #elif L==6 // gn - "Información" // Okoteve traducción + "Marandu" #elif L==7 // it "Informazione" #elif L==8 // pl @@ -20494,7 +20494,7 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = #elif L==5 // fr "Information" #elif L==6 // gn - "Información" // Okoteve traducción + "Marandu" #elif L==7 // it "Informazione" #elif L==8 // pl @@ -20542,7 +20542,7 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = #elif L==5 // fr "Information" #elif L==6 // gn - "Información" // Okoteve traducción + "Marandu" #elif L==7 // it "Informazione" #elif L==8 // pl @@ -20659,7 +20659,7 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = #elif L==5 // fr "Information" #elif L==6 // gn - "Información" // Okoteve traducción + "Marandu" #elif L==7 // it "Informazione" #elif L==8 // pl @@ -20753,7 +20753,7 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = #elif L==5 // fr "Information" #elif L==6 // gn - "Información" // Okoteve traducción + "Marandu" #elif L==7 // it "Informazione" #elif L==8 // pl @@ -20801,7 +20801,7 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = #elif L==5 // fr "Information" #elif L==6 // gn - "Información" // Okoteve traducción + "Marandu" #elif L==7 // it "Informazione" #elif L==8 // pl diff --git a/swad_timeline_comment.c b/swad_timeline_comment.c index 72a6ac90..c81ae7e4 100644 --- a/swad_timeline_comment.c +++ b/swad_timeline_comment.c @@ -697,8 +697,8 @@ static void TmlCom_WriteButtons (const struct Tml_Timeline *Timeline, static void TmlCom_PutFormToRemoveComm (const struct Tml_Timeline *Timeline, long PubCod) { - extern const Act_Action_t TmlFrm_ActionUsr[TmlFrm_NUM_ACTIONS]; - extern const Act_Action_t TmlFrm_ActionGbl[TmlFrm_NUM_ACTIONS]; + extern Act_Action_t TmlFrm_ActionUsr[TmlFrm_NUM_ACTIONS]; + extern Act_Action_t TmlFrm_ActionGbl[TmlFrm_NUM_ACTIONS]; /***** Form to remove publication *****/ /* Begin form */ diff --git a/swad_timeline_form.c b/swad_timeline_form.c index e0b6d470..495b8f4c 100644 --- a/swad_timeline_form.c +++ b/swad_timeline_form.c @@ -43,7 +43,7 @@ /************************* Private constants and types ***********************/ /*****************************************************************************/ -const Act_Action_t TmlFrm_ActionGbl[TmlFrm_NUM_ACTIONS] = +Act_Action_t TmlFrm_ActionGbl[TmlFrm_NUM_ACTIONS] = { [TmlFrm_RECEIVE_POST] = ActRcvPstGblTL, [TmlFrm_RECEIVE_COMM] = ActRcvComGblTL, @@ -62,7 +62,7 @@ const Act_Action_t TmlFrm_ActionGbl[TmlFrm_NUM_ACTIONS] = [TmlFrm_ALL_FAV_COMM] = ActAllFavComGblTL, [TmlFrm_SHO_HID_COMM] = ActShoHidComGblTL, }; -const Act_Action_t TmlFrm_ActionUsr[TmlFrm_NUM_ACTIONS] = +Act_Action_t TmlFrm_ActionUsr[TmlFrm_NUM_ACTIONS] = { [TmlFrm_RECEIVE_POST] = ActRcvPstUsrTL, [TmlFrm_RECEIVE_COMM] = ActRcvComUsrTL, diff --git a/swad_timeline_note.c b/swad_timeline_note.c index 2c46dc4a..50069d12 100644 --- a/swad_timeline_note.c +++ b/swad_timeline_note.c @@ -539,11 +539,11 @@ static void TmlNot_WriteLocationInHierarchy (const struct TmlNot_Note *Not, static void TmlNot_PutFormGoToAction (const struct TmlNot_Note *Not, const struct For_Forums *Forums) { - extern const Act_Action_t For_ActionsSeeFor[For_NUM_TYPES_FORUM]; + extern Act_Action_t For_ActionsSeeFor[For_NUM_TYPES_FORUM]; extern const char *Txt_TIMELINE_NOTE[Tml_NOT_NUM_NOTE_TYPES]; extern const char *Txt_not_available; char *Anchor = NULL; - static const Act_Action_t Tml_DefaultActions[Tml_NOT_NUM_NOTE_TYPES] = + static Act_Action_t Tml_DefaultActions[Tml_NOT_NUM_NOTE_TYPES] = { [TmlNot_UNKNOWN ] = ActUnk, /* Start tab */ @@ -862,8 +862,8 @@ static void TmlNot_WriteFavShaRem (const struct Tml_Timeline *Timeline, static void TmlNot_PutFormToRemoveNote (const struct Tml_Timeline *Timeline, long NotCod) { - extern const Act_Action_t TmlFrm_ActionUsr[TmlFrm_NUM_ACTIONS]; - extern const Act_Action_t TmlFrm_ActionGbl[TmlFrm_NUM_ACTIONS]; + extern Act_Action_t TmlFrm_ActionUsr[TmlFrm_NUM_ACTIONS]; + extern Act_Action_t TmlFrm_ActionGbl[TmlFrm_NUM_ACTIONS]; /***** Form to remove publication *****/ /* Begin form */ diff --git a/swad_timeline_publication.c b/swad_timeline_publication.c index cb5d6fc9..81ab8a08 100644 --- a/swad_timeline_publication.c +++ b/swad_timeline_publication.c @@ -281,7 +281,7 @@ static void TmlPub_InitializeRangeOfPubs (Tml_WhatToGet_t WhatToGet, static unsigned TmlPub_GetMaxPubsToGet (const struct Tml_Timeline *Timeline) { - static const unsigned MaxPubsToGet[Tml_NUM_WHAT_TO_GET] = + static unsigned MaxPubsToGet[Tml_NUM_WHAT_TO_GET] = { [Tml_GET_NEW_PUBS] = TmlPub_MAX_NEW_PUBS_TO_GET_AND_SHOW, [Tml_GET_REC_PUBS] = TmlPub_MAX_REC_PUBS_TO_GET_AND_SHOW, diff --git a/swad_timetable.c b/swad_timetable.c index a81e1a92..709f6fea 100644 --- a/swad_timetable.c +++ b/swad_timetable.c @@ -94,7 +94,7 @@ struct Tmt_Cell *Tmt_TimeTable[Tmt_DAYS_PER_WEEK]; /* Possible resolutions of the timetable in minutes */ #define Tmt_NUM_RESOLUTIONS 3 -static const unsigned Tmt_MinutesPerInterval[Tmt_NUM_RESOLUTIONS] = +static unsigned Tmt_MinutesPerInterval[Tmt_NUM_RESOLUTIONS] = { 5, // 5 minutes 15, // 15 minutes // Use 10 or 15 minutes (15 looks better), never both together @@ -316,7 +316,7 @@ void Tmt_ShowClassTimeTable (void) [Tmt_MY_TIMETABLE ] = Hlp_PROFILE_Timetable, [Tmt_TUTORING_TIMETABLE] = NULL, }; - static const Act_Action_t ActChgTT1stDay[Tmt_NUM_TIMETABLE_TYPES] = + static Act_Action_t ActChgTT1stDay[Tmt_NUM_TIMETABLE_TYPES] = { [Tmt_COURSE_TIMETABLE ] = ActChgCrsTT1stDay, [Tmt_MY_TIMETABLE ] = ActChgMyTT1stDay, @@ -442,7 +442,7 @@ static void Tmt_PutContextualIcons (void *Timetable) static void Tmt_PutFormToSelectWhichGroupsToShow (const struct Tmt_Timetable *Timetable) { - static const Act_Action_t ActSeeTT[Tmt_NUM_TIMETABLE_TYPES] = + static Act_Action_t ActSeeTT[Tmt_NUM_TIMETABLE_TYPES] = { [Tmt_COURSE_TIMETABLE ] = ActSeeCrsTT, [Tmt_MY_TIMETABLE ] = ActSeeMyTT, @@ -1495,7 +1495,7 @@ static void Tmt_TimeTableDrawCellEdit (const struct Tmt_Timetable *Timetable, extern const char *Txt_Group; extern const char *Txt_All_groups; extern const char *Txt_Info; - static const Act_Action_t NextAction[Tmt_NUM_TIMETABLE_TYPES] = + static Act_Action_t NextAction[Tmt_NUM_TIMETABLE_TYPES] = { [Tmt_COURSE_TIMETABLE ] = ActChgCrsTT, [Tmt_MY_TIMETABLE ] = ActChgTut, diff --git a/swad_user.c b/swad_user.c index 1824ab30..941207d1 100644 --- a/swad_user.c +++ b/swad_user.c @@ -1218,7 +1218,7 @@ void Usr_WriteFormLogin (Act_Action_t NextAction,void (*FuncPars) (void)) void Usr_WelcomeUsr (void) { extern const char *Ico_IconSetId[Ico_NUM_ICON_SETS]; - extern const unsigned Txt_Current_CGI_SWAD_Language; + extern unsigned Txt_Current_CGI_SWAD_Language; extern const char *Txt_NEW_YEAR_GREETING; extern const char *Txt_Happy_birthday_X; extern const char *Txt_Please_check_your_email_address; @@ -6421,7 +6421,7 @@ void Usr_WriteAuthor1Line (long UsrCod,HidVis_HiddenOrVisible_t HiddenOrVisible) void Usr_ShowTableCellWithUsrData (struct Usr_Data *UsrDat,unsigned NumRows) { - static const Act_Action_t NextAction[Rol_NUM_ROLES] = + static Act_Action_t NextAction[Rol_NUM_ROLES] = { [Rol_STD] = ActSeeRecOneStd, [Rol_NET] = ActSeeRecOneTch, @@ -6441,8 +6441,7 @@ void Usr_ShowTableCellWithUsrData (struct Usr_Data *UsrDat,unsigned NumRows) NumRows + 1,The_GetColorRows ()); else HTM_TD_Begin ("class=\"LT LINE_BOTTOM %s\"",The_GetColorRows ()); - Pho_ShowUsrPhotoIfAllowed (UsrDat, - ClassPhoto[Gbl.Prefs.PhotoShape],Pho_ZOOM); + Pho_ShowUsrPhotoIfAllowed (UsrDat,ClassPhoto[Gbl.Prefs.PhotoShape],Pho_ZOOM); HTM_TD_End (); /***** User's IDs and name *****/