diff --git a/sql/swad.sql b/sql/swad.sql index 2f9c2df3f..649c98bbd 100644 --- a/sql/swad.sql +++ b/sql/swad.sql @@ -649,12 +649,6 @@ CREATE TABLE IF NOT EXISTS games ( -- -- Table hidden_params: stores some hidden parameters passed from a page to another using database instead of forms -- --- CREATE TABLE IF NOT EXISTS hidden_params ( --- SessionId CHAR(43) NOT NULL, --- Action INT NOT NULL, --- ParamName VARCHAR(255) NOT NULL, --- ParamValue LONGTEXT NOT NULL, --- INDEX(SessionId,Action)); CREATE TABLE IF NOT EXISTS hidden_params ( SessionId CHAR(43) NOT NULL, ParamName VARCHAR(255) NOT NULL, diff --git a/swad_ID.c b/swad_ID.c index 3eec40c32..8ce3e9ec5 100644 --- a/swad_ID.c +++ b/swad_ID.c @@ -481,16 +481,11 @@ static void ID_PutLinkToConfirmID (struct UsrData *UsrDat,unsigned NumID, switch (Gbl.Action.Original) { case ActSeeRecSevGst: - // Usr_PutHiddenParUsrCodAll (ActCnfID_Oth,Gbl.Usrs.Selected.List[Rol_UNK]); - Usr_PutHiddenParUsrCodAll (Gbl.Usrs.Selected.List[Rol_UNK]); - break; case ActSeeRecSevStd: - // Usr_PutHiddenParUsrCodAll (ActCnfID_Std,Gbl.Usrs.Selected.List[Rol_UNK]); + case ActSeeRecSevTch: Usr_PutHiddenParUsrCodAll (Gbl.Usrs.Selected.List[Rol_UNK]); break; - case ActSeeRecSevTch: - // Usr_PutHiddenParUsrCodAll (ActCnfID_Tch,Gbl.Usrs.Selected.List[Rol_UNK]); - Usr_PutHiddenParUsrCodAll (Gbl.Usrs.Selected.List[Rol_UNK]); + default: break; } } diff --git a/swad_attendance.c b/swad_attendance.c index ad2b1f74a..51ae0e9da 100644 --- a/swad_attendance.c +++ b/swad_attendance.c @@ -3052,7 +3052,6 @@ static void Att_PutParamsToPrintStdsList (void) if (Gbl.AttEvents.ShowDetails) Par_PutHiddenParamChar ("ShowDetails",'Y'); Grp_PutParamsCodGrps (); - // Usr_PutHiddenParUsrCodAll (ActPrnLstUsrAtt,Gbl.Usrs.Selected.List[Rol_UNK]); Usr_PutHiddenParUsrCodAll (Gbl.Usrs.Selected.List[Rol_UNK]); if (Gbl.AttEvents.StrAttCodsSelected) if (Gbl.AttEvents.StrAttCodsSelected[0]) @@ -3071,7 +3070,6 @@ static void Att_PutButtonToShowDetails (void) Frm_StartFormAnchor (Gbl.Action.Act,Att_ATTENDANCE_DETAILS_ID); Par_PutHiddenParamChar ("ShowDetails",'Y'); Grp_PutParamsCodGrps (); - // Usr_PutHiddenParUsrCodAll (Gbl.Action.Act,Gbl.Usrs.Selected.List[Rol_UNK]); Usr_PutHiddenParUsrCodAll (Gbl.Usrs.Selected.List[Rol_UNK]); if (Gbl.AttEvents.StrAttCodsSelected) if (Gbl.AttEvents.StrAttCodsSelected[0]) @@ -3111,7 +3109,6 @@ static void Att_ListEventsToSelect (Att_TypeOfView_t TypeOfView) { Frm_StartFormAnchor (Gbl.Action.Act,Att_ATTENDANCE_TABLE_ID); Grp_PutParamsCodGrps (); - // Usr_PutHiddenParUsrCodAll (Gbl.Action.Act,Gbl.Usrs.Selected.List[Rol_UNK]); Usr_PutHiddenParUsrCodAll (Gbl.Usrs.Selected.List[Rol_UNK]); } diff --git a/swad_changelog.h b/swad_changelog.h index 562ab41fe..392151891 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -448,10 +448,11 @@ En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 18.118 (2019-04-22)" +#define Log_PLATFORM_VERSION "SWAD 18.118.1 (2019-04-22)" #define CSS_FILE "swad18.112.1.css" #define JS_FILE "swad18.116.5.js" /* + Version 18.118.1: Apr 22, 2019 Removed unused code related to hidden_params table. (242682 lines) Version 18.118: Apr 22, 2019 Changed the behaviour of creating in folder of file browser. Removed action from hidden_params table. (242841 lines) 2 changes necessary in database: diff --git a/swad_database.c b/swad_database.c index 881a3607d..4b39af6bc 100644 --- a/swad_database.c +++ b/swad_database.c @@ -1418,29 +1418,11 @@ mysql> DESCRIBE hidden_params; | Field | Type | Null | Key | Default | Extra | +------------+--------------+------+-----+---------+-------+ | SessionId | char(43) | NO | MUL | NULL | | -| Action | int(11) | NO | | NULL | | -| ParamName | varchar(255) | NO | | NULL | | -| ParamValue | longtext | NO | | NULL | | -+------------+--------------+------+-----+---------+-------+ -4 rows in set (0,00 sec) -mysql> DESCRIBE hidden_params; -+------------+--------------+------+-----+---------+-------+ -| Field | Type | Null | Key | Default | Extra | -+------------+--------------+------+-----+---------+-------+ -| SessionId | char(43) | NO | MUL | NULL | | | ParamName | varchar(255) | NO | | NULL | | | ParamValue | longtext | NO | | NULL | | +------------+--------------+------+-----+---------+-------+ 3 rows in set (0.01 sec) */ - /* - DB_CreateTable ("CREATE TABLE IF NOT EXISTS hidden_params (" - "SessionId CHAR(43) NOT NULL," // Cns_BYTES_SESSION_ID - "Action INT NOT NULL," - "ParamName VARCHAR(255) NOT NULL," - "ParamValue LONGTEXT NOT NULL," - "INDEX(SessionId,Action))"); - */ DB_CreateTable ("CREATE TABLE IF NOT EXISTS hidden_params (" "SessionId CHAR(43) NOT NULL," // Cns_BYTES_SESSION_ID "ParamName VARCHAR(255) NOT NULL," diff --git a/swad_file_browser.c b/swad_file_browser.c index 96f620d91..91f778056 100644 --- a/swad_file_browser.c +++ b/swad_file_browser.c @@ -1846,7 +1846,6 @@ void Brw_GetParAndInitFileBrowser (void) break; /***** Another users' works *****/ - case ActReqAsgWrkCrs: case ActReqRemFilWrkCrs: case ActRemFilWrkCrs: case ActRemFolWrkCrs: @@ -2304,7 +2303,6 @@ void Brw_PutParamsFileBrowser (const char *PathInTree,const char *FileFolderName if (Brw_GetIfCrsAssigWorksFileBrowser ()) { /***** Users selected *****/ - // Usr_PutHiddenParUsrCodAll (NextAction,Gbl.Usrs.Selected.List[Rol_UNK]); Usr_PutHiddenParUsrCodAll (Gbl.Usrs.Selected.List[Rol_UNK]); Usr_PutParamOtherUsrCodEncrypted (); } @@ -3075,9 +3073,6 @@ void Brw_AskEditWorksCrs (void) extern const char *Txt_Assignments_and_other_works; extern const char *Txt_View_homework; - /***** Get parameters related to file browser *****/ - Brw_GetParAndInitFileBrowser (); - /***** List users to select some of them *****/ Usr_PutFormToSelectUsrsToGoToAct (ActAdmAsgWrkCrs,NULL, Txt_Assignments_and_other_works, @@ -4942,10 +4937,6 @@ static void Brw_PutParamsFullTree (void) else if (Brw_GetIfProjectFileBrowser ()) // This file browser needs specify a project Prj_PutParamPrjCod (Gbl.Prjs.PrjCod); else if (Brw_GetIfCrsAssigWorksFileBrowser ()) - /* - Usr_PutHiddenParUsrCodAll (Brw_ActSeeAdm[Gbl.FileBrowser.Type], - Gbl.Usrs.Selected.List[Rol_UNK]); - */ Usr_PutHiddenParUsrCodAll (Gbl.Usrs.Selected.List[Rol_UNK]); } @@ -6162,8 +6153,6 @@ static void Brw_PutIconFolderWithPlus (const char *FileBrowserId,const char *Row const char PathInTree[PATH_MAX + 1], const char *FileName) { - // extern const char *Txt_Upload_file_or_create_folder; - /***** Start container *****/ fprintf (Gbl.F.Out,"
"); } diff --git a/swad_follow.c b/swad_follow.c index 4d85597a6..5a8f50e56 100644 --- a/swad_follow.c +++ b/swad_follow.c @@ -95,14 +95,11 @@ static void Fol_PutInactiveIconToFollowUnfollow (void); static void Fol_PutIconToFollow (struct UsrData *UsrDat); static void Fol_PutIconToUnfollow (struct UsrData *UsrDat); -static void Fol_RequestFollowUsrs (Act_Action_t NextAction,void (*FuncParams) (void)); -static void Fol_RequestUnfollowUsrs (Act_Action_t NextAction,void (*FuncParams) (void)); +static void Fol_RequestFollowUsrs (Act_Action_t NextAction); +static void Fol_RequestUnfollowUsrs (Act_Action_t NextAction); static void Fol_GetFollowedFromSelectedUsrs (unsigned *NumFollowed, unsigned *NumNotFollowed); -static void Fol_PutParamsFollowSelectedStds (void); -static void Fol_PutParamsFollowSelectedTchs (void); -static void Fol_PutParamsUnfollowSelectedStds (void); -static void Fol_PutParamsUnfollowSelectedTchs (void); +static void Fol_PutParamsSelectedUsrs (void); static void Fol_FollowUsr (struct UsrData *UsrDat); static void Fol_UnfollowUsr (struct UsrData *UsrDat); @@ -1091,15 +1088,15 @@ void Fol_UnfollowUsr2 (void) void Fol_RequestFollowStds (void) { - Fol_RequestFollowUsrs (ActFolSevStd,Fol_PutParamsFollowSelectedStds); + Fol_RequestFollowUsrs (ActFolSevStd); } void Fol_RequestFollowTchs (void) { - Fol_RequestFollowUsrs (ActFolSevTch,Fol_PutParamsFollowSelectedTchs); + Fol_RequestFollowUsrs (ActFolSevTch); } -static void Fol_RequestFollowUsrs (Act_Action_t NextAction,void (*FuncParams) (void)) +static void Fol_RequestFollowUsrs (Act_Action_t NextAction) { extern const char *Txt_Follow; extern const char *Txt_Do_you_want_to_follow_the_selected_user_whom_you_do_not_follow_yet; @@ -1118,12 +1115,12 @@ static void Fol_RequestFollowUsrs (Act_Action_t NextAction,void (*FuncParams) (v { if (NumNotFollowed == 1) Ale_ShowAlertAndButton (NextAction,NULL,NULL, - FuncParams, + Fol_PutParamsSelectedUsrs, Btn_CREATE_BUTTON,Txt_Follow, Ale_QUESTION,Txt_Do_you_want_to_follow_the_selected_user_whom_you_do_not_follow_yet); else Ale_ShowAlertAndButton (NextAction,NULL,NULL, - FuncParams, + Fol_PutParamsSelectedUsrs, Btn_CREATE_BUTTON,Txt_Follow, Ale_QUESTION,Txt_Do_you_want_to_follow_the_X_selected_users_whom_you_do_not_follow_yet, NumNotFollowed); @@ -1135,15 +1132,15 @@ static void Fol_RequestFollowUsrs (Act_Action_t NextAction,void (*FuncParams) (v void Fol_RequestUnfollowStds (void) { - Fol_RequestUnfollowUsrs (ActUnfSevStd,Fol_PutParamsUnfollowSelectedStds); + Fol_RequestUnfollowUsrs (ActUnfSevStd); } void Fol_RequestUnfollowTchs (void) { - Fol_RequestUnfollowUsrs (ActUnfSevTch,Fol_PutParamsUnfollowSelectedTchs); + Fol_RequestUnfollowUsrs (ActUnfSevTch); } -static void Fol_RequestUnfollowUsrs (Act_Action_t NextAction,void (*FuncParams) (void)) +static void Fol_RequestUnfollowUsrs (Act_Action_t NextAction) { extern const char *Txt_Do_you_want_to_stop_following_the_selected_user_whom_you_follow; extern const char *Txt_Do_you_want_to_stop_following_the_X_selected_users_whom_you_follow; @@ -1162,12 +1159,12 @@ static void Fol_RequestUnfollowUsrs (Act_Action_t NextAction,void (*FuncParams) { if (NumFollowed == 1) Ale_ShowAlertAndButton (NextAction,NULL,NULL, - FuncParams, + Fol_PutParamsSelectedUsrs, Btn_CREATE_BUTTON,Txt_Unfollow, Ale_QUESTION,Txt_Do_you_want_to_stop_following_the_selected_user_whom_you_follow); else Ale_ShowAlertAndButton (NextAction,NULL,NULL, - FuncParams, + Fol_PutParamsSelectedUsrs, Btn_CREATE_BUTTON,Txt_Unfollow, Ale_QUESTION,Txt_Do_you_want_to_stop_following_the_X_selected_users_whom_you_follow, NumFollowed); @@ -1327,31 +1324,9 @@ void Fol_UnfollowUsrs (void) /**************** Put parameter with list of selected users ******************/ /*****************************************************************************/ -static void Fol_PutParamsFollowSelectedStds (void) +static void Fol_PutParamsSelectedUsrs (void) { /***** Hidden parameter with the encrypted codes of users selected *****/ - // Usr_PutHiddenParUsrCodAll (ActFolSevStd,Gbl.Usrs.Selected.List[Rol_UNK]); - Usr_PutHiddenParUsrCodAll (Gbl.Usrs.Selected.List[Rol_UNK]); - } - -static void Fol_PutParamsFollowSelectedTchs (void) - { - /***** Hidden parameter with the encrypted codes of users selected *****/ - // Usr_PutHiddenParUsrCodAll (ActFolSevTch,Gbl.Usrs.Selected.List[Rol_UNK]); - Usr_PutHiddenParUsrCodAll (Gbl.Usrs.Selected.List[Rol_UNK]); - } - -static void Fol_PutParamsUnfollowSelectedStds (void) - { - /***** Hidden parameter with the encrypted codes of users selected *****/ - // Usr_PutHiddenParUsrCodAll (ActUnfSevStd,Gbl.Usrs.Selected.List[Rol_UNK]); - Usr_PutHiddenParUsrCodAll (Gbl.Usrs.Selected.List[Rol_UNK]); - } - -static void Fol_PutParamsUnfollowSelectedTchs (void) - { - /***** Hidden parameter with the encrypted codes of users selected *****/ - // Usr_PutHiddenParUsrCodAll (ActUnfSevTch,Gbl.Usrs.Selected.List[Rol_UNK]); Usr_PutHiddenParUsrCodAll (Gbl.Usrs.Selected.List[Rol_UNK]); } diff --git a/swad_message.c b/swad_message.c index fb7f122c1..1500222a3 100644 --- a/swad_message.c +++ b/swad_message.c @@ -395,7 +395,6 @@ static void Msg_PutParamsShowMorePotentialRecipients (void) void Msg_PutParamsWriteMsg (void) { - // Usr_PutHiddenParUsrCodAll (ActReqMsgUsr,Gbl.Usrs.Selected.List[Rol_UNK]); Usr_PutHiddenParUsrCodAll (Gbl.Usrs.Selected.List[Rol_UNK]); Msg_PutHiddenParamOtherRecipients (); Msg_PutHiddenParamsSubjectAndContent (); diff --git a/swad_record.c b/swad_record.c index ab5d04044..006cb80b0 100644 --- a/swad_record.c +++ b/swad_record.c @@ -986,7 +986,6 @@ static void Rec_ListRecordsGsts (Rec_SharedRecordViewType_t TypeOfView) /* Link to print view */ Frm_StartForm (ActPrnRecSevGst); - // Usr_PutHiddenParUsrCodAll (ActPrnRecSevGst,Gbl.Usrs.Selected.List[Rol_UNK]); Usr_PutHiddenParUsrCodAll (Gbl.Usrs.Selected.List[Rol_UNK]); Rec_ShowLinkToPrintPreviewOfRecords (); Frm_EndForm (); @@ -1084,7 +1083,6 @@ static void Rec_ShowRecordOneStdCrs (void) /* Link to print view */ Frm_StartForm (ActPrnRecSevStd); - // Usr_PutHiddenParUsrCodAll (ActPrnRecSevStd,Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); Usr_PutHiddenParUsrCodAll (Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); Rec_ShowLinkToPrintPreviewOfRecords (); Frm_EndForm (); @@ -1186,7 +1184,6 @@ static void Rec_ListRecordsStds (Rec_SharedRecordViewType_t ShaTypeOfView, /* Link to print view */ Frm_StartForm (ActPrnRecSevStd); - // Usr_PutHiddenParUsrCodAll (ActPrnRecSevStd,Gbl.Usrs.Selected.List[Rol_UNK]); Usr_PutHiddenParUsrCodAll (Gbl.Usrs.Selected.List[Rol_UNK]); Rec_ShowLinkToPrintPreviewOfRecords (); Frm_EndForm (); @@ -1313,7 +1310,6 @@ static void Rec_ShowRecordOneTchCrs (void) /* Link to print view */ Frm_StartForm (ActPrnRecSevTch); - // Usr_PutHiddenParUsrCodAll (ActPrnRecSevTch,Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); Usr_PutHiddenParUsrCodAll (Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); Par_PutHiddenParamChar ("ParamOfficeHours",'Y'); Par_PutHiddenParamChar ("ShowOfficeHours",ShowOfficeHours ? 'Y' : @@ -1402,7 +1398,6 @@ static void Rec_ListRecordsTchs (Rec_SharedRecordViewType_t TypeOfView) /* Link to print view */ Frm_StartForm (ActPrnRecSevTch); - // Usr_PutHiddenParUsrCodAll (ActPrnRecSevTch,Gbl.Usrs.Selected.List[Rol_UNK]); Usr_PutHiddenParUsrCodAll (Gbl.Usrs.Selected.List[Rol_UNK]); Par_PutHiddenParamChar ("ParamOfficeHours",'Y'); Par_PutHiddenParamChar ("ShowOfficeHours", @@ -1559,7 +1554,6 @@ static void Rec_PutParamsShowOfficeHoursOneTch (void) static void Rec_PutParamsShowOfficeHoursSeveralTchs (void) { - // Usr_PutHiddenParUsrCodAll (ActSeeRecSevTch,Gbl.Usrs.Selected.List[Rol_UNK]); Usr_PutHiddenParUsrCodAll (Gbl.Usrs.Selected.List[Rol_UNK]); Par_PutHiddenParamChar ("ParamOfficeHours",'Y'); } @@ -1734,7 +1728,6 @@ static void Rec_ShowCrsRecord (Rec_CourseRecordViewType_t TypeOfView, Act_GetActCod (ActSeeRecSevStd)); // Original action, used to know where we came from Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); if (TypeOfView == Rec_CRS_LIST_SEVERAL_RECORDS) - // Usr_PutHiddenParUsrCodAll (ActRcvRecOthUsr,Gbl.Usrs.Selected.List[Rol_UNK]); Usr_PutHiddenParUsrCodAll (Gbl.Usrs.Selected.List[Rol_UNK]); } break; diff --git a/swad_session.c b/swad_session.c index 708255f48..eb440bb0e 100644 --- a/swad_session.c +++ b/swad_session.c @@ -53,10 +53,6 @@ extern struct Globals Gbl; static void Ses_RemoveSessionFromDB (void); -/* -static bool Ses_CheckIfHiddenParIsAlreadyInDB (Act_Action_t NextAction, - const char *ParamName); -*/ static bool Ses_CheckIfHiddenParIsAlreadyInDB (const char *ParamName); /*****************************************************************************/ @@ -335,35 +331,19 @@ bool Ses_GetSessionData (void) /******************* Insert hidden parameter in the database *****************/ /*****************************************************************************/ -/* -void Ses_InsertHiddenParInDB (Act_Action_t NextAction, - const char *ParamName,const char *ParamValue) -*/ void Ses_InsertHiddenParInDB (const char *ParamName,const char *ParamValue) { /***** Before of inserting the first hidden parameter passed to the next action, delete all the parameters coming from the previous action *****/ Ses_RemoveHiddenParFromThisSession (); - /***** For a unique session-action-parameter, don't insert a parameter more than one time *****/ + /***** For a unique session-parameter, + don't insert a parameter more than one time *****/ if (ParamName) if (ParamName[0]) - // if (!Ses_CheckIfHiddenParIsAlreadyInDB (NextAction,ParamName)) if (!Ses_CheckIfHiddenParIsAlreadyInDB (ParamName)) { /***** Insert parameter in the database *****/ - /* - DB_QueryINSERT ("can not create hidden parameter", - "INSERT INTO hidden_params" - " (SessionId,Action,ParamName,ParamValue)" - " VALUES" - " ('%s',%ld,'%s','%s')", - Gbl.Session.Id, - Act_GetActCod (NextAction), - ParamName, - ParamValue ? ParamValue : - ""); - */ DB_QueryINSERT ("can not create hidden parameter", "INSERT INTO hidden_params" " (SessionId,ParamName,ParamValue)" @@ -409,23 +389,8 @@ void Ses_RemoveHiddenParFromExpiredSessions (void) /*****************************************************************************/ // Return true if the parameter already existed in database -/* -static bool Ses_CheckIfHiddenParIsAlreadyInDB (Act_Action_t NextAction, - const char *ParamName) -*/ static bool Ses_CheckIfHiddenParIsAlreadyInDB (const char *ParamName) { - /***** Get a hidden parameter from database *****/ - /* - return (DB_QueryCOUNT ("can not check if a hidden parameter" - " is already in database", - "SELECT COUNT(*) FROM hidden_params" - " WHERE SessionId='%s'" - " AND Action=%ld AND ParamName='%s'", - Gbl.Session.Id, - Act_GetActCod (NextAction), - ParamName) != 0); - */ return (DB_QueryCOUNT ("can not check if a hidden parameter" " is already in database", "SELECT COUNT(*) FROM hidden_params" @@ -440,11 +405,6 @@ static bool Ses_CheckIfHiddenParIsAlreadyInDB (const char *ParamName) /*****************************************************************************/ // Return true if the parameter is too big -/* -unsigned Ses_GetHiddenParFromDB (Act_Action_t NextAction, - const char *ParamName,char *ParamValue, - size_t MaxBytes) -*/ unsigned Ses_GetHiddenParFromDB (const char *ParamName,char *ParamValue, size_t MaxBytes) { @@ -460,17 +420,6 @@ unsigned Ses_GetHiddenParFromDB (const char *ParamName,char *ParamValue, if (Gbl.Session.IsOpen) // If the session is open, get parameter from DB { /***** Get a hidden parameter from database *****/ - /* - NumRows = DB_QuerySELECT (&mysql_res,"can not get a hidden parameter", - "SELECT ParamValue" - " FROM hidden_params" - " WHERE SessionId='%s'" - " AND Action=%ld" - " AND ParamName='%s'", - Gbl.Session.Id, - Act_GetActCod (NextAction), - ParamName); - */ NumRows = DB_QuerySELECT (&mysql_res,"can not get a hidden parameter", "SELECT ParamValue" " FROM hidden_params" diff --git a/swad_session.h b/swad_session.h index 43c5dee1b..82aa5a7ab 100644 --- a/swad_session.h +++ b/swad_session.h @@ -46,18 +46,10 @@ void Ses_UpdateSessionDataInDB (void); void Ses_UpdateSessionLastRefreshInDB (void); void Ses_RemoveExpiredSessions (void); bool Ses_GetSessionData (void); -/* -void Ses_InsertHiddenParInDB (Act_Action_t NextAction, - const char *ParamName,const char *ParamValue); -*/ + void Ses_InsertHiddenParInDB (const char *ParamName,const char *ParamValue); void Ses_RemoveHiddenParFromThisSession (void); void Ses_RemoveHiddenParFromExpiredSessions (void); -/* -unsigned Ses_GetHiddenParFromDB (Act_Action_t NextAction, - const char *ParamName,char *ParamValue, - size_t MaxBytes); -*/ unsigned Ses_GetHiddenParFromDB (const char *ParamName,char *ParamValue, size_t MaxBytes); diff --git a/swad_statistic.c b/swad_statistic.c index 4e232a54e..dda9c5235 100644 --- a/swad_statistic.c +++ b/swad_statistic.c @@ -1595,7 +1595,6 @@ static void Sta_ShowDetailedAccessesList (unsigned long NumRows,MYSQL_RES *mysql Par_PutHiddenParamLong ("FirstRow",FirstRow - Gbl.Stat.RowsPerPage); Par_PutHiddenParamLong ("LastRow" ,FirstRow - 1); Par_PutHiddenParamLong ("RowsPage",Gbl.Stat.RowsPerPage); - // Usr_PutHiddenParUsrCodAll (ActSeeAccCrs,Gbl.Usrs.Selected.List[Rol_UNK]); Usr_PutHiddenParUsrCodAll (Gbl.Usrs.Selected.List[Rol_UNK]); } fprintf (Gbl.F.Out,""); @@ -1632,7 +1631,6 @@ static void Sta_ShowDetailedAccessesList (unsigned long NumRows,MYSQL_RES *mysql Par_PutHiddenParamUnsigned ("FirstRow" ,(unsigned) (LastRow + 1)); Par_PutHiddenParamUnsigned ("LastRow" ,(unsigned) (LastRow + Gbl.Stat.RowsPerPage)); Par_PutHiddenParamUnsigned ("RowsPage" ,(unsigned) Gbl.Stat.RowsPerPage); - // Usr_PutHiddenParUsrCodAll (ActSeeAccCrs,Gbl.Usrs.Selected.List[Rol_UNK]); Usr_PutHiddenParUsrCodAll (Gbl.Usrs.Selected.List[Rol_UNK]); } fprintf (Gbl.F.Out,""); @@ -2108,7 +2106,6 @@ static void Sta_ShowDistrAccessesPerDayAndHour (unsigned long NumRows,MYSQL_RES Par_PutHiddenParamUnsigned ("CountType",(unsigned) Gbl.Stat.CountType); Par_PutHiddenParamUnsigned ("StatAct" ,(unsigned) Gbl.Stat.NumAction); if (Gbl.Action.Act == ActSeeAccCrs) - // Usr_PutHiddenParUsrCodAll (ActSeeAccCrs,Gbl.Usrs.Selected.List[Rol_UNK]); Usr_PutHiddenParUsrCodAll (Gbl.Usrs.Selected.List[Rol_UNK]); else // Gbl.Action.Act == ActSeeAccGbl { diff --git a/swad_user.c b/swad_user.c index 3e874461c..52c8cf0ff 100644 --- a/swad_user.c +++ b/swad_user.c @@ -5643,7 +5643,6 @@ static void Usr_PutParamsConfirmIWantToSeeBigList (void) /************* Write parameter with the list of users selected ***************/ /*****************************************************************************/ -// void Usr_PutHiddenParUsrCodAll (Act_Action_t NextAction,const char *ListUsrCods) void Usr_PutHiddenParUsrCodAll (const char *ListUsrCods) { /***** Put a parameter indicating that a list of several users is present *****/ @@ -5651,7 +5650,6 @@ void Usr_PutHiddenParUsrCodAll (const char *ListUsrCods) /***** Put a parameter with the encrypted user codes of several users *****/ if (Gbl.Session.IsOpen) - // Ses_InsertHiddenParInDB (NextAction,Usr_ParamUsrCod[Rol_UNK],ListUsrCods); Ses_InsertHiddenParInDB (Usr_ParamUsrCod[Rol_UNK],ListUsrCods); else Par_PutHiddenParamString (Usr_ParamUsrCod[Rol_UNK],ListUsrCods); @@ -5672,10 +5670,6 @@ void Usr_GetListsSelectedUsrsCods (void) Usr_AllocateListSelectedUsrCod (Rol_UNK); if (Gbl.Session.IsOpen) // If the session is open, get parameter from DB { - /* - Ses_GetHiddenParFromDB (Gbl.Action.Act,Usr_ParamUsrCod[Rol_UNK],Gbl.Usrs.Selected.List[Rol_UNK], - Usr_MAX_BYTES_LIST_ENCRYPTED_USR_CODS); - */ Ses_GetHiddenParFromDB (Usr_ParamUsrCod[Rol_UNK],Gbl.Usrs.Selected.List[Rol_UNK], Usr_MAX_BYTES_LIST_ENCRYPTED_USR_CODS); Str_ChangeFormat (Str_FROM_FORM,Str_TO_TEXT,Gbl.Usrs.Selected.List[Rol_UNK], @@ -6121,9 +6115,6 @@ void Usr_PutFormToSelectUsrsToGoToAct (Act_Action_t NextAction,void (*FuncParams /***** Get groups to show ******/ Grp_GetParCodsSeveralGrpsToShowUsrs (); - /***** Get lists of the selected users if not already got *****/ - Usr_GetListsSelectedUsrsCods (); - /***** Get and order lists of users from this course *****/ Usr_GetListUsrs (Hie_CRS,Rol_STD); Usr_GetListUsrs (Hie_CRS,Rol_NET); @@ -6189,9 +6180,6 @@ void Usr_PutFormToSelectUsrsToGoToAct (Act_Action_t NextAction,void (*FuncParams Usr_FreeUsrsList (Rol_NET); Usr_FreeUsrsList (Rol_STD); - /***** Free memory used by list of selected users' codes *****/ - Usr_FreeListsSelectedUsrsCods (); - /***** Free memory for list of selected groups *****/ Grp_FreeListCodSelectedGrps (); @@ -7799,9 +7787,6 @@ void Usr_SeeGuests (void) if (Usr_GetIfShowBigList (Gbl.Usrs.LstUsrs[Rol_GST].NumUsrs, Sco_PutParamCurrentScope,NULL)) { - /***** Get list of selected users *****/ - Usr_GetListsSelectedUsrsCods (); - /***** Form to select type of list of users *****/ Usr_ShowFormsToSelectUsrListType (Sco_PutParamCurrentScope); @@ -7961,9 +7946,6 @@ void Usr_SeeStudents (void) if (Usr_GetIfShowBigList (Gbl.Usrs.LstUsrs[Rol_STD].NumUsrs, Sco_PutParamCurrentScope,NULL)) { - /***** Get list of selected users *****/ - Usr_GetListsSelectedUsrsCods (); - /***** Form to select type of list of users *****/ Usr_ShowFormsToSelectUsrListType (Sco_PutParamCurrentScope); @@ -7974,12 +7956,12 @@ void Usr_SeeStudents (void) Gbl.Scope.Current == Hie_DEG || Gbl.Scope.Current == Hie_CTR || Gbl.Scope.Current == Hie_INS) ? Gbl.Hierarchy.Ins.InsCod : - -1L, + -1L, (Gbl.Scope.Current == Hie_CRS || Gbl.Scope.Current == Hie_DEG) ? Gbl.Hierarchy.Deg.DegCod : - -1L, + -1L, Gbl.Scope.Current == Hie_CRS ? Gbl.Hierarchy.Crs.CrsCod : - -1L); + -1L); /* Set options allowed */ PutForm = Usr_SetOptionsListUsrsAllowed (Rol_STD,ICanChooseOption); diff --git a/swad_user.h b/swad_user.h index a920a70c6..a1b48cfe3 100644 --- a/swad_user.h +++ b/swad_user.h @@ -411,7 +411,6 @@ bool Usr_GetIfShowBigList (unsigned NumUsrs, void (*FuncParams) (void), const char *OnSubmit); -// void Usr_PutHiddenParUsrCodAll (Act_Action_t NextAction,const char *ListUsrCods); void Usr_PutHiddenParUsrCodAll (const char *ListUsrCods); void Usr_GetListsSelectedUsrsCods (void); bool Usr_GetListMsgRecipientsWrittenExplicitelyBySender (bool WriteErrorMsgs); diff --git a/swad_zip.c b/swad_zip.c index 0f4ceb1c1..1c6bfdd0b 100644 --- a/swad_zip.c +++ b/swad_zip.c @@ -132,7 +132,6 @@ void ZIP_PutLinkToCreateZIPAsgWrk (void) static void ZIP_PutLinkToCreateZIPAsgWrkParams (void) { - // Usr_PutHiddenParUsrCodAll (ActAdmAsgWrkCrs,Gbl.Usrs.Selected.List[Rol_UNK]); Usr_PutHiddenParUsrCodAll (Gbl.Usrs.Selected.List[Rol_UNK]); if (Gbl.FileBrowser.FullTree) Par_PutHiddenParamChar ("FullTree",'Y');