diff --git a/sql/swad.sql b/sql/swad.sql index ca7649fe6..2f9c2df3f 100644 --- a/sql/swad.sql +++ b/sql/swad.sql @@ -649,12 +649,17 @@ 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, - Action INT NOT NULL, ParamName VARCHAR(255) NOT NULL, ParamValue LONGTEXT NOT NULL, - INDEX(SessionId,Action)); + INDEX(SessionId)); -- -- Table holidays: stores the holidays in each institution -- diff --git a/swad_ID.c b/swad_ID.c index b87886123..3eec40c32 100644 --- a/swad_ID.c +++ b/swad_ID.c @@ -481,13 +481,16 @@ 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 (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]); + // Usr_PutHiddenParUsrCodAll (ActCnfID_Std,Gbl.Usrs.Selected.List[Rol_UNK]); + Usr_PutHiddenParUsrCodAll (Gbl.Usrs.Selected.List[Rol_UNK]); break; case ActSeeRecSevTch: - Usr_PutHiddenParUsrCodAll (ActCnfID_Tch,Gbl.Usrs.Selected.List[Rol_UNK]); + // Usr_PutHiddenParUsrCodAll (ActCnfID_Tch,Gbl.Usrs.Selected.List[Rol_UNK]); + Usr_PutHiddenParUsrCodAll (Gbl.Usrs.Selected.List[Rol_UNK]); break; } } diff --git a/swad_assignment.c b/swad_assignment.c index 100551073..dbd714f1b 100644 --- a/swad_assignment.c +++ b/swad_assignment.c @@ -484,7 +484,7 @@ static void Asg_WriteAsgAuthor (struct Assignment *Asg) static void Asg_WriteAssignmentFolder (struct Assignment *Asg,bool PrintView) { - extern const char *Txt_Upload_file_or_create_folder_in_FOLDER; + extern const char *Txt_Upload_file_or_create_folder; extern const char *Txt_Folder; bool ICanSendFiles = !Asg->Hidden && // It's visible (not hidden) Asg->Open && // It's open (inside dates) @@ -497,14 +497,16 @@ static void Asg_WriteAssignmentFolder (struct Assignment *Asg,bool PrintView) { /* Form to create a new file or folder */ Frm_StartForm (ActFrmCreAsgUsr); + /* Brw_PutParamsFileBrowser (ActUnk, Brw_INTERNAL_NAME_ROOT_FOLDER_ASSIGNMENTS, Asg->Folder, Brw_IS_FOLDER,-1L); - snprintf (Gbl.Title,sizeof (Gbl.Title), - Txt_Upload_file_or_create_folder_in_FOLDER, - Asg->Folder); - Ico_PutIconLink ("folder-open-green.svg",Gbl.Title); + */ + Brw_PutParamsFileBrowser (Brw_INTERNAL_NAME_ROOT_FOLDER_ASSIGNMENTS, + Asg->Folder, + Brw_IS_FOLDER,-1L); + Ico_PutIconLink ("folder-open-green.svg",Txt_Upload_file_or_create_folder); Frm_EndForm (); } else // Sending of files disabled diff --git a/swad_attendance.c b/swad_attendance.c index f04c2d78c..ad2b1f74a 100644 --- a/swad_attendance.c +++ b/swad_attendance.c @@ -3052,7 +3052,8 @@ 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 (ActPrnLstUsrAtt,Gbl.Usrs.Selected.List[Rol_UNK]); + Usr_PutHiddenParUsrCodAll (Gbl.Usrs.Selected.List[Rol_UNK]); if (Gbl.AttEvents.StrAttCodsSelected) if (Gbl.AttEvents.StrAttCodsSelected[0]) Par_PutHiddenParamString ("AttCods",Gbl.AttEvents.StrAttCodsSelected); @@ -3070,7 +3071,8 @@ 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.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]) Par_PutHiddenParamString ("AttCods",Gbl.AttEvents.StrAttCodsSelected); @@ -3109,7 +3111,8 @@ 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.Action.Act,Gbl.Usrs.Selected.List[Rol_UNK]); + Usr_PutHiddenParUsrCodAll (Gbl.Usrs.Selected.List[Rol_UNK]); } /***** Start table *****/ diff --git a/swad_changelog.h b/swad_changelog.h index c0674a509..562ab41fe 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -448,10 +448,16 @@ En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 18.117.5 (2019-04-21)" +#define Log_PLATFORM_VERSION "SWAD 18.118 (2019-04-22)" #define CSS_FILE "swad18.112.1.css" #define JS_FILE "swad18.116.5.js" /* + 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: +DROP TABLE hidden_params; +CREATE TABLE IF NOT EXISTS hidden_params (SessionId CHAR(43) NOT NULL,ParamName VARCHAR(255) NOT NULL,ParamValue LONGTEXT NOT NULL,INDEX(SessionId)); + Version 18.117.5: Apr 21, 2019 Changed the behaviour of expanding/contracting folder in file browser. (242610 lines) Version 18.117.4: Apr 21, 2019 Code refactoring in file browser. (242621 lines) Version 18.117.3: Apr 21, 2019 Changed the behaviour of pasting a file/folder in file browser. (242633 lines) @@ -476,6 +482,7 @@ ps2pdf source.ps destination.pdf Version 18.114.1: Apr 18, 2019 Changes in translation of title related to project locking/unlocking. (243024 lines) Version 18.114: Apr 17, 2019 Project locking/unlocking is made via AJAX. (243023 lines) Version 18.113: Apr 17, 2019 Individual locking of the edition of each project through a padlock icon. Only the teacher of the subject can lock / unlock each project. Suggested by Pedro Villar Castro. (243000 lines) + 1 change necessary in database: ALTER TABLE projects ADD COLUMN Locked ENUM('N','Y') NOT NULL DEFAULT 'N' AFTER DptCod; Version 18.112.2: Apr 12, 2019 Changed icons for preassigned/non-preassigned projects. (242783 lines) diff --git a/swad_database.c b/swad_database.c index 8dc0f183d..881a3607d 100644 --- a/swad_database.c +++ b/swad_database.c @@ -1423,13 +1423,29 @@ mysql> DESCRIBE hidden_params; | 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," + "ParamValue LONGTEXT NOT NULL," + "INDEX(SessionId))"); /***** Table holidays *****/ /* diff --git a/swad_file_browser.c b/swad_file_browser.c index 733fae030..96f620d91 100644 --- a/swad_file_browser.c +++ b/swad_file_browser.c @@ -1289,15 +1289,13 @@ static void Brw_PutIconFolder (unsigned Level, const char *FileBrowserId,const char *RowId, Brw_IconTree_t IconSubtree, const char *PathInTree, - const char *FileName, - const char *FileNameToShow); + const char *FileName); static void Brw_PutIconFolderWithoutPlus (const char *FileBrowserId,const char *RowId, bool Open,bool Hidden); static void Brw_PutIconFolderWithPlus (const char *FileBrowserId,const char *RowId, bool Open,bool Hidden, const char PathInTree[PATH_MAX + 1], - const char *FileName, - const char *FileNameToShow); + const char *FileName); static void Brw_PutIconNewFileOrFolder (void); static void Brw_PutIconFileWithLinkToViewMetadata (unsigned Size, @@ -2278,14 +2276,22 @@ long Brw_GetParamFilCod (void) static void Brw_PutImplicitParamsFileBrowser (void) { + /* Brw_PutParamsFileBrowser (ActUnk, Brw_PathInTree,Brw_FileName, Gbl.FileBrowser.FileType,-1L); + */ + Brw_PutParamsFileBrowser (Brw_PathInTree,Brw_FileName, + Gbl.FileBrowser.FileType,-1L); } +/* void Brw_PutParamsFileBrowser (Act_Action_t NextAction, const char *PathInTree,const char *FileFolderName, Brw_FileType_t FileType,long FilCod) +*/ +void Brw_PutParamsFileBrowser (const char *PathInTree,const char *FileFolderName, + Brw_FileType_t FileType,long FilCod) { if (Brw_GetIfGroupFileBrowser ()) // This file browser needs specify a group /***** Group code *****/ @@ -2293,12 +2299,13 @@ void Brw_PutParamsFileBrowser (Act_Action_t NextAction, else if (Brw_GetIfProjectFileBrowser ()) // This file browser needs specify a project /***** Project code *****/ Prj_PutParamPrjCod (Gbl.Prjs.PrjCod); - else if (NextAction != ActUnk) + else// if (NextAction != ActUnk) { if (Brw_GetIfCrsAssigWorksFileBrowser ()) { /***** Users selected *****/ - Usr_PutHiddenParUsrCodAll (NextAction,Gbl.Usrs.Selected.List[Rol_UNK]); + // Usr_PutHiddenParUsrCodAll (NextAction,Gbl.Usrs.Selected.List[Rol_UNK]); + Usr_PutHiddenParUsrCodAll (Gbl.Usrs.Selected.List[Rol_UNK]); Usr_PutParamOtherUsrCodEncrypted (); } } @@ -4935,8 +4942,11 @@ 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]); } /*****************************************************************************/ @@ -5616,7 +5626,7 @@ static bool Brw_WriteRowFileBrowser (unsigned Level,const char *RowId, if (Gbl.FileBrowser.FileType == Brw_IS_FOLDER) /* Icon with folder */ Brw_PutIconFolder (Level,FileBrowserId,RowId,IconThisRow, - PathInTree,FileName,FileNameToShow); + PathInTree,FileName); else // File or link { /* Icon with file type or link */ @@ -5930,9 +5940,13 @@ static void Brw_PutIconToExpandFolder (const char *FileBrowserId,const char *Row Frm_StartFormAnchorOnSubmit (Brw_ActExpandFolder[Gbl.FileBrowser.Type], FileBrowserId, JavaScriptFuncToExpandFolder); // JavaScript function to unhide rows + /* Brw_PutParamsFileBrowser (Brw_ActExpandFolder[Gbl.FileBrowser.Type], PathInTree,FileName, Brw_IS_FOLDER,-1L); + */ + Brw_PutParamsFileBrowser (PathInTree,FileName, + Brw_IS_FOLDER,-1L); Ico_PutIconLink ("caret-right.svg",Txt_Expand); Frm_EndForm (); @@ -5966,9 +5980,13 @@ static void Brw_PutIconToContractFolder (const char *FileBrowserId,const char *R Frm_StartFormAnchorOnSubmit (Brw_ActContractFolder[Gbl.FileBrowser.Type], FileBrowserId, JavaScriptFuncToContractFolder); // JavaScript function to hide rows + /* Brw_PutParamsFileBrowser (Brw_ActContractFolder[Gbl.FileBrowser.Type], PathInTree,FileName, Brw_IS_FOLDER,-1L); + */ + Brw_PutParamsFileBrowser (PathInTree,FileName, + Brw_IS_FOLDER,-1L); Ico_PutIconLink ("caret-down.svg",Txt_Contract); Frm_EndForm (); @@ -6031,8 +6049,7 @@ static void Brw_PutIconFolder (unsigned Level, const char *FileBrowserId,const char *RowId, Brw_IconTree_t IconSubtree, const char *PathInTree, - const char *FileName, - const char *FileNameToShow) + const char *FileName) { bool ICanCreate; @@ -6049,13 +6066,13 @@ static void Brw_PutIconFolder (unsigned Level, Brw_PutIconFolderWithPlus (FileBrowserId,RowId, false, // Closed false, // Visible - PathInTree,FileName,FileNameToShow); + PathInTree,FileName); /***** Hidden icon with folder open *****/ Brw_PutIconFolderWithPlus (FileBrowserId,RowId, true, // Open true, // Hidden - PathInTree,FileName,FileNameToShow); + PathInTree,FileName); } else { @@ -6063,13 +6080,13 @@ static void Brw_PutIconFolder (unsigned Level, Brw_PutIconFolderWithPlus (FileBrowserId,RowId, false, // Closed true, // Hidden - PathInTree,FileName,FileNameToShow); + PathInTree,FileName); /***** Visible icon with folder open *****/ Brw_PutIconFolderWithPlus (FileBrowserId,RowId, true, // Open false, // Visible - PathInTree,FileName,FileNameToShow); + PathInTree,FileName); } } else // I can't create a new file or folder @@ -6143,10 +6160,9 @@ static void Brw_PutIconFolderWithoutPlus (const char *FileBrowserId,const char * static void Brw_PutIconFolderWithPlus (const char *FileBrowserId,const char *RowId, bool Open,bool Hidden, const char PathInTree[PATH_MAX + 1], - const char *FileName, - const char *FileNameToShow) + const char *FileName) { - extern const char *Txt_Upload_file_or_create_folder_in_FOLDER; + // extern const char *Txt_Upload_file_or_create_folder; /***** Start container *****/ fprintf (Gbl.F.Out,"
"); /***** Form and icon *****/ + Brw_PathInTree = PathInTree; + Brw_FileName = FileName; + Ico_PutContextualIconToCreateInFolder (Brw_ActFormCreate[Gbl.FileBrowser.Type], + Brw_PutImplicitParamsFileBrowser, + Open); +/* Frm_StartForm (Brw_ActFormCreate[Gbl.FileBrowser.Type]); Brw_PutParamsFileBrowser (Brw_ActFormCreate[Gbl.FileBrowser.Type], PathInTree,FileName, Brw_IS_FOLDER,-1L); - snprintf (Gbl.Title,sizeof (Gbl.Title), - Txt_Upload_file_or_create_folder_in_FOLDER, - FileNameToShow); Ico_PutIconLink (Open ? "folder-open-yellow-plus.png" : "folder-yellow-plus.png", - Gbl.Title); + Txt_Upload_file_or_create_folder); Frm_EndForm (); - +*/ /***** End container *****/ fprintf (Gbl.F.Out,"
"); } @@ -6205,10 +6224,15 @@ static void Brw_PutIconFileWithLinkToViewMetadata (unsigned Size, extern const char *Txt_View_data_of_FILE_OR_LINK_X; Frm_StartForm (Brw_ActReqDatFile[Gbl.FileBrowser.Type]); + /* Brw_PutParamsFileBrowser (Brw_ActReqDatFile[Gbl.FileBrowser.Type], NULL,NULL, Brw_IS_UNKNOWN, // Not used FileMetadata->FilCod); + */ + Brw_PutParamsFileBrowser (NULL,NULL, + Brw_IS_UNKNOWN, // Not used + FileMetadata->FilCod); /***** Name and link of the file or folder *****/ snprintf (Gbl.Title,sizeof (Gbl.Title), @@ -6298,9 +6322,13 @@ static void Brw_WriteFileName (unsigned Level,bool IsPublic, if (Gbl.FileBrowser.ICanEditFileOrFolder) // Can I rename this folder? { Frm_StartForm (Brw_ActRenameFolder[Gbl.FileBrowser.Type]); + /* Brw_PutParamsFileBrowser (Brw_ActRenameFolder[Gbl.FileBrowser.Type], PathInTree,FileName, Brw_IS_FOLDER,-1L); + */ + Brw_PutParamsFileBrowser (PathInTree,FileName, + Brw_IS_FOLDER,-1L); } /***** Write name of the folder *****/ @@ -6348,9 +6376,13 @@ static void Brw_WriteFileName (unsigned Level,bool IsPublic, fprintf (Gbl.F.Out,"
"); Frm_StartForm (Brw_ActDowFile[Gbl.FileBrowser.Type]); + /* Brw_PutParamsFileBrowser (Brw_ActDowFile[Gbl.FileBrowser.Type], PathInTree,FileName, Gbl.FileBrowser.FileType,-1L); + */ + Brw_PutParamsFileBrowser (PathInTree,FileName, + Gbl.FileBrowser.FileType,-1L); /* Link to the form and to the file */ snprintf (Gbl.Title,sizeof (Gbl.Title), @@ -6603,10 +6635,15 @@ void Brw_AskRemFileFromTree (void) static void Brw_PutParamsRemFile (void) { + /* Brw_PutParamsFileBrowser (Brw_ActRemoveFile[Gbl.FileBrowser.Type], Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk, Gbl.FileBrowser.FilFolLnkName, Gbl.FileBrowser.FileType,-1L); + */ + Brw_PutParamsFileBrowser (Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk, + Gbl.FileBrowser.FilFolLnkName, + Gbl.FileBrowser.FileType,-1L); } /*****************************************************************************/ @@ -6744,10 +6781,15 @@ static void Brw_AskConfirmRemoveFolderNotEmpty (void) static void Brw_PutParamsRemFolder (void) { + /* Brw_PutParamsFileBrowser (Brw_ActRemoveFolderNotEmpty[Gbl.FileBrowser.Type], Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk, Gbl.FileBrowser.FilFolLnkName, Brw_IS_FOLDER,-1L); + */ + Brw_PutParamsFileBrowser (Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk, + Gbl.FileBrowser.FilFolLnkName, + Brw_IS_FOLDER,-1L); } /*****************************************************************************/ @@ -8412,10 +8454,15 @@ static void Brw_PutFormToCreateAFolder (const char FileNameToShow[NAME_MAX + 1]) /***** Start form *****/ Frm_StartForm (Brw_ActCreateFolder[Gbl.FileBrowser.Type]); + /* Brw_PutParamsFileBrowser (Brw_ActCreateFolder[Gbl.FileBrowser.Type], Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk, Gbl.FileBrowser.FilFolLnkName, Brw_IS_FOLDER,-1L); + */ + Brw_PutParamsFileBrowser (Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk, + Gbl.FileBrowser.FilFolLnkName, + Brw_IS_FOLDER,-1L); /***** Start box *****/ Box_StartBox (NULL,Txt_Create_folder,NULL, @@ -8475,10 +8522,15 @@ static void Brw_PutFormToUploadFilesUsingDropzone (const char *FileNameToShow) Cfg_URL_ICON_PUBLIC); Par_PutHiddenParamLong ("act",Act_GetActCod (Brw_ActUploadFileDropzone[Gbl.FileBrowser.Type])); Par_PutHiddenParamString ("ses",Gbl.Session.Id); + /* Brw_PutParamsFileBrowser (Brw_ActUploadFileDropzone[Gbl.FileBrowser.Type], Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk, Gbl.FileBrowser.FilFolLnkName, Brw_IS_FOLDER,-1L); + */ + Brw_PutParamsFileBrowser (Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk, + Gbl.FileBrowser.FilFolLnkName, + Brw_IS_FOLDER,-1L); fprintf (Gbl.F.Out,"
" "%s" @@ -8488,10 +8540,15 @@ static void Brw_PutFormToUploadFilesUsingDropzone (const char *FileNameToShow) /***** Put button to refresh file browser after upload *****/ Frm_StartForm (Brw_ActRefreshAfterUploadFiles[Gbl.FileBrowser.Type]); + /* Brw_PutParamsFileBrowser (Brw_ActRefreshAfterUploadFiles[Gbl.FileBrowser.Type], NULL,NULL, Brw_IS_UNKNOWN, // Not used -1L); + */ + Brw_PutParamsFileBrowser (NULL,NULL, + Brw_IS_UNKNOWN, // Not used + -1L); /***** Button to send *****/ Btn_PutConfirmButton (Txt_Done); @@ -8524,10 +8581,15 @@ static void Brw_PutFormToUploadOneFileClassic (const char *FileNameToShow) /***** Form to upload one files using the classic way *****/ Frm_StartForm (Brw_ActUploadFileClassic[Gbl.FileBrowser.Type]); + /* Brw_PutParamsFileBrowser (Brw_ActUploadFileClassic[Gbl.FileBrowser.Type], Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk, Gbl.FileBrowser.FilFolLnkName, Brw_IS_FOLDER,-1L); + */ + Brw_PutParamsFileBrowser (Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk, + Gbl.FileBrowser.FilFolLnkName, + Brw_IS_FOLDER,-1L); fprintf (Gbl.F.Out,"", Fil_NAME_OF_PARAM_FILENAME_ORG); @@ -8551,10 +8613,15 @@ static void Brw_PutFormToPasteAFileOrFolder (const char *FileNameToShow) /***** Start form *****/ Frm_StartForm (Brw_ActPaste[Gbl.FileBrowser.Type]); + /* Brw_PutParamsFileBrowser (Brw_ActPaste[Gbl.FileBrowser.Type], Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk, Gbl.FileBrowser.FilFolLnkName, Brw_IS_FOLDER,-1L); + */ + Brw_PutParamsFileBrowser (Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk, + Gbl.FileBrowser.FilFolLnkName, + Brw_IS_FOLDER,-1L); /***** Start box *****/ Box_StartBox (NULL,Txt_Paste,NULL, @@ -8586,10 +8653,15 @@ static void Brw_PutFormToCreateALink (const char *FileNameToShow) /***** Start form *****/ Frm_StartForm (Brw_ActCreateLink[Gbl.FileBrowser.Type]); + /* Brw_PutParamsFileBrowser (Brw_ActCreateLink[Gbl.FileBrowser.Type], Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk, Gbl.FileBrowser.FilFolLnkName, Brw_IS_FOLDER,-1L); + */ + Brw_PutParamsFileBrowser (Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk, + Gbl.FileBrowser.FilFolLnkName, + Brw_IS_FOLDER,-1L); /***** Start box *****/ Box_StartBox (NULL,Txt_Create_link,NULL, @@ -9581,10 +9653,15 @@ void Brw_ShowFileMetadata (void) } Frm_StartForm (Brw_ActRecDatFile[Gbl.FileBrowser.Type]); + /* Brw_PutParamsFileBrowser (Brw_ActRecDatFile[Gbl.FileBrowser.Type], FileMetadata.PathInTreeUntilFilFolLnk, FileMetadata.FilFolLnkName, FileMetadata.FileType,-1L); + */ + Brw_PutParamsFileBrowser (FileMetadata.PathInTreeUntilFilFolLnk, + FileMetadata.FilFolLnkName, + FileMetadata.FileType,-1L); } /***** Start box and table *****/ @@ -10099,10 +10176,15 @@ static void Brw_WriteBigLinkToDownloadFile (const char *URL, /* Form to see marks */ Frm_StartForm (Gbl.FileBrowser.Type == Brw_SHOW_MRK_CRS ? ActSeeMyMrkCrs : ActSeeMyMrkGrp); + /* Brw_PutParamsFileBrowser (ActUnk, FileMetadata->PathInTreeUntilFilFolLnk, FileMetadata->FilFolLnkName, FileMetadata->FileType,-1L); + */ + Brw_PutParamsFileBrowser (FileMetadata->PathInTreeUntilFilFolLnk, + FileMetadata->FilFolLnkName, + FileMetadata->FileType,-1L); /* Link begin */ snprintf (Gbl.Title,sizeof (Gbl.Title), @@ -10157,10 +10239,15 @@ static void Brw_WriteSmallLinkToDownloadFile (const char *URL,Brw_FileType_t Fil /* Form to see marks */ Frm_StartForm (Gbl.FileBrowser.Type == Brw_SHOW_MRK_CRS ? ActSeeMyMrkCrs : ActSeeMyMrkGrp); + /* Brw_PutParamsFileBrowser (ActUnk, Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk, Gbl.FileBrowser.FilFolLnkName, FileType,-1L); + */ + Brw_PutParamsFileBrowser (Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk, + Gbl.FileBrowser.FilFolLnkName, + FileType,-1L); /* Link begin */ snprintf (Gbl.Title,sizeof (Gbl.Title), @@ -12174,6 +12261,7 @@ static void Brw_WriteRowDocData (unsigned long *NumDocsNotHidden,MYSQL_ROW row) Frm_StartForm (Action); /* Parameters to go to file / folder */ + /* Brw_PutParamsFileBrowser (ActUnk, FileMetadata.FileType == Brw_IS_FOLDER ? FileMetadata.PathInTreeUntilFilFolLnk : NULL, @@ -12182,6 +12270,14 @@ static void Brw_WriteRowDocData (unsigned long *NumDocsNotHidden,MYSQL_ROW row) FileMetadata.FileType, FileMetadata.FileType == Brw_IS_FOLDER ? -1L : FileMetadata.FilCod); + */ + Brw_PutParamsFileBrowser (FileMetadata.FileType == Brw_IS_FOLDER ? FileMetadata.PathInTreeUntilFilFolLnk : + NULL, + FileMetadata.FileType == Brw_IS_FOLDER ? FileMetadata.FilFolLnkName : + NULL, + FileMetadata.FileType, + FileMetadata.FileType == Brw_IS_FOLDER ? -1L : + FileMetadata.FilCod); /* File or folder icon */ Frm_LinkFormSubmit (FileNameToShow,"DAT_N",NULL); diff --git a/swad_file_browser.h b/swad_file_browser.h index 3c6fcbde4..488c96dd3 100644 --- a/swad_file_browser.h +++ b/swad_file_browser.h @@ -247,9 +247,13 @@ void Brw_SetFullPathInTree (const char *PathInTreeUntilFileOrFolder,const char * void Brw_CreateTmpPublicLinkToPrivateFile (const char *FullPathIncludingFile, const char *FileName); +/* void Brw_PutParamsFileBrowser (Act_Action_t NextAction, const char *PathInTree,const char *FileFolderName, Brw_FileType_t FileType,long FilCod); +*/ +void Brw_PutParamsFileBrowser (const char *PathInTree,const char *FileFolderName, + Brw_FileType_t FileType,long FilCod); void Brw_RemoveZonesOfGroupsOfType (long GrpTypCod); void Brw_RemoveGrpZones (long CrsCod,long GrpCod); diff --git a/swad_follow.c b/swad_follow.c index cbe289cca..4d85597a6 100644 --- a/swad_follow.c +++ b/swad_follow.c @@ -1330,25 +1330,29 @@ void Fol_UnfollowUsrs (void) static void Fol_PutParamsFollowSelectedStds (void) { /***** Hidden parameter with the encrypted codes of users selected *****/ - Usr_PutHiddenParUsrCodAll (ActFolSevStd,Gbl.Usrs.Selected.List[Rol_UNK]); + // 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 (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 (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 (ActUnfSevTch,Gbl.Usrs.Selected.List[Rol_UNK]); + Usr_PutHiddenParUsrCodAll (Gbl.Usrs.Selected.List[Rol_UNK]); } /*****************************************************************************/ diff --git a/swad_icon.c b/swad_icon.c index b46cbf4dd..68e3b9c4a 100644 --- a/swad_icon.c +++ b/swad_icon.c @@ -306,6 +306,16 @@ void Ico_PutContextualIconToPaste (Act_Action_t NextAction,void (*FuncParams) (v Txt_Paste); } +void Ico_PutContextualIconToCreateInFolder (Act_Action_t NextAction,void (*FuncParams) (void),bool Open) + { + extern const char *Txt_Upload_file_or_create_folder; + + Lay_PutContextualLinkOnlyIcon (NextAction,NULL,FuncParams, + Open ? "folder-open-yellow-plus.png" : + "folder-yellow-plus.png", + Txt_Upload_file_or_create_folder); + } + /*****************************************************************************/ /**************** Show an icon inside a div (without text) *******************/ /*****************************************************************************/ diff --git a/swad_icon.h b/swad_icon.h index f84d9ab3b..2c0d83390 100644 --- a/swad_icon.h +++ b/swad_icon.h @@ -67,6 +67,7 @@ void Ico_PutContextualIconToHide (Act_Action_t NextAction,const char *Anchor,voi void Ico_PutContextualIconToPrint (Act_Action_t NextAction,void (*FuncParams) (void)); void Ico_PutContextualIconToCopy (Act_Action_t NextAction,void (*FuncParams) (void)); void Ico_PutContextualIconToPaste (Act_Action_t NextAction,void (*FuncParams) (void)); +void Ico_PutContextualIconToCreateInFolder (Act_Action_t NextAction,void (*FuncParams) (void),bool Open); void Ico_PutDivIcon (const char *DivClass,const char *Icon,const char *Title); void Ico_PutDivIconLink (const char *DivClass,const char *Icon,const char *Title); diff --git a/swad_mark.c b/swad_mark.c index fcec8d43d..d86101355 100644 --- a/swad_mark.c +++ b/swad_mark.c @@ -145,9 +145,13 @@ void Mrk_GetAndWriteNumRowsHeaderAndFooter (Brw_FileType_t FileType, Mrk_HeadOrFootStr[Brw_HEADER],Marks.Header, Gbl.RowEvenOdd, Gbl.Form.Id); + /* Brw_PutParamsFileBrowser (ActUnk, PathInTree,FileName, FileType,-1L); + */ + Brw_PutParamsFileBrowser (PathInTree,FileName, + FileType,-1L); Frm_EndForm (); fprintf (Gbl.F.Out,""); @@ -172,9 +176,13 @@ void Mrk_GetAndWriteNumRowsHeaderAndFooter (Brw_FileType_t FileType, Mrk_HeadOrFootStr[Brw_FOOTER],Marks.Footer, Gbl.RowEvenOdd, Gbl.Form.Id); + /* Brw_PutParamsFileBrowser (ActUnk, PathInTree,FileName, FileType,-1L); + */ + Brw_PutParamsFileBrowser (PathInTree,FileName, + FileType,-1L); Frm_EndForm (); fprintf (Gbl.F.Out,""); } diff --git a/swad_message.c b/swad_message.c index e5f2c168c..fb7f122c1 100644 --- a/swad_message.c +++ b/swad_message.c @@ -395,7 +395,8 @@ static void Msg_PutParamsShowMorePotentialRecipients (void) void Msg_PutParamsWriteMsg (void) { - Usr_PutHiddenParUsrCodAll (ActReqMsgUsr,Gbl.Usrs.Selected.List[Rol_UNK]); + // Usr_PutHiddenParUsrCodAll (ActReqMsgUsr,Gbl.Usrs.Selected.List[Rol_UNK]); + Usr_PutHiddenParUsrCodAll (Gbl.Usrs.Selected.List[Rol_UNK]); Msg_PutHiddenParamOtherRecipients (); Msg_PutHiddenParamsSubjectAndContent (); if (Gbl.Msg.Reply.IsReply) diff --git a/swad_record.c b/swad_record.c index 55379dc1f..ab5d04044 100644 --- a/swad_record.c +++ b/swad_record.c @@ -986,7 +986,8 @@ 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 (ActPrnRecSevGst,Gbl.Usrs.Selected.List[Rol_UNK]); + Usr_PutHiddenParUsrCodAll (Gbl.Usrs.Selected.List[Rol_UNK]); Rec_ShowLinkToPrintPreviewOfRecords (); Frm_EndForm (); fprintf (Gbl.F.Out,"
"); @@ -1083,7 +1084,8 @@ static void Rec_ShowRecordOneStdCrs (void) /* Link to print view */ Frm_StartForm (ActPrnRecSevStd); - Usr_PutHiddenParUsrCodAll (ActPrnRecSevStd,Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); + // Usr_PutHiddenParUsrCodAll (ActPrnRecSevStd,Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); + Usr_PutHiddenParUsrCodAll (Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); Rec_ShowLinkToPrintPreviewOfRecords (); Frm_EndForm (); @@ -1184,7 +1186,8 @@ 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 (ActPrnRecSevStd,Gbl.Usrs.Selected.List[Rol_UNK]); + Usr_PutHiddenParUsrCodAll (Gbl.Usrs.Selected.List[Rol_UNK]); Rec_ShowLinkToPrintPreviewOfRecords (); Frm_EndForm (); fprintf (Gbl.F.Out,"
"); @@ -1310,7 +1313,8 @@ static void Rec_ShowRecordOneTchCrs (void) /* Link to print view */ Frm_StartForm (ActPrnRecSevTch); - Usr_PutHiddenParUsrCodAll (ActPrnRecSevTch,Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); + // Usr_PutHiddenParUsrCodAll (ActPrnRecSevTch,Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); + Usr_PutHiddenParUsrCodAll (Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); Par_PutHiddenParamChar ("ParamOfficeHours",'Y'); Par_PutHiddenParamChar ("ShowOfficeHours",ShowOfficeHours ? 'Y' : 'N'); @@ -1398,7 +1402,8 @@ 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 (ActPrnRecSevTch,Gbl.Usrs.Selected.List[Rol_UNK]); + Usr_PutHiddenParUsrCodAll (Gbl.Usrs.Selected.List[Rol_UNK]); Par_PutHiddenParamChar ("ParamOfficeHours",'Y'); Par_PutHiddenParamChar ("ShowOfficeHours", ShowOfficeHours ? 'Y' : @@ -1554,7 +1559,8 @@ static void Rec_PutParamsShowOfficeHoursOneTch (void) static void Rec_PutParamsShowOfficeHoursSeveralTchs (void) { - Usr_PutHiddenParUsrCodAll (ActSeeRecSevTch,Gbl.Usrs.Selected.List[Rol_UNK]); + // Usr_PutHiddenParUsrCodAll (ActSeeRecSevTch,Gbl.Usrs.Selected.List[Rol_UNK]); + Usr_PutHiddenParUsrCodAll (Gbl.Usrs.Selected.List[Rol_UNK]); Par_PutHiddenParamChar ("ParamOfficeHours",'Y'); } @@ -1728,7 +1734,8 @@ 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 (ActRcvRecOthUsr,Gbl.Usrs.Selected.List[Rol_UNK]); + Usr_PutHiddenParUsrCodAll (Gbl.Usrs.Selected.List[Rol_UNK]); } break; default: diff --git a/swad_session.c b/swad_session.c index 8c522fb35..708255f48 100644 --- a/swad_session.c +++ b/swad_session.c @@ -53,8 +53,11 @@ 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); /*****************************************************************************/ /************************** Get number of open sessions **********************/ @@ -332,8 +335,11 @@ 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 *****/ @@ -342,9 +348,11 @@ void Ses_InsertHiddenParInDB (Act_Action_t NextAction, /***** For a unique session-action-parameter, don't insert a parameter more than one time *****/ if (ParamName) if (ParamName[0]) - if (!Ses_CheckIfHiddenParIsAlreadyInDB (NextAction,ParamName)) + // 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)" @@ -355,6 +363,16 @@ void Ses_InsertHiddenParInDB (Act_Action_t NextAction, ParamName, ParamValue ? ParamValue : ""); + */ + DB_QueryINSERT ("can not create hidden parameter", + "INSERT INTO hidden_params" + " (SessionId,ParamName,ParamValue)" + " VALUES" + " ('%s','%s','%s')", + Gbl.Session.Id, + ParamName, + ParamValue ? ParamValue : + ""); Gbl.HiddenParamsInsertedIntoDB = true; } } @@ -391,17 +409,30 @@ 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); + Act_GetActCod (NextAction), + ParamName) != 0); + */ + return (DB_QueryCOUNT ("can not check if a hidden parameter" + " is already in database", + "SELECT COUNT(*) FROM hidden_params" + " WHERE SessionId='%s'" + " AND ParamName='%s'", + Gbl.Session.Id, + ParamName) != 0); } /*****************************************************************************/ @@ -409,9 +440,13 @@ static bool Ses_CheckIfHiddenParIsAlreadyInDB (Act_Action_t NextAction, /*****************************************************************************/ // 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) { MYSQL_RES *mysql_res; MYSQL_ROW row; @@ -425,6 +460,7 @@ unsigned Ses_GetHiddenParFromDB (Act_Action_t NextAction, 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" @@ -434,6 +470,14 @@ unsigned Ses_GetHiddenParFromDB (Act_Action_t NextAction, Gbl.Session.Id, Act_GetActCod (NextAction), ParamName); + */ + NumRows = DB_QuerySELECT (&mysql_res,"can not get a hidden parameter", + "SELECT ParamValue" + " FROM hidden_params" + " WHERE SessionId='%s'" + " AND ParamName='%s'", + Gbl.Session.Id, + ParamName); /***** Check if the parameter is found in database *****/ if (NumRows) diff --git a/swad_session.h b/swad_session.h index c53dd0af9..43c5dee1b 100644 --- a/swad_session.h +++ b/swad_session.h @@ -46,12 +46,19 @@ 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); #endif diff --git a/swad_statistic.c b/swad_statistic.c index f701f2687..4e232a54e 100644 --- a/swad_statistic.c +++ b/swad_statistic.c @@ -1595,7 +1595,8 @@ 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 (ActSeeAccCrs,Gbl.Usrs.Selected.List[Rol_UNK]); + Usr_PutHiddenParUsrCodAll (Gbl.Usrs.Selected.List[Rol_UNK]); } fprintf (Gbl.F.Out,""); if (FirstRow > 1) @@ -1631,7 +1632,8 @@ 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 (ActSeeAccCrs,Gbl.Usrs.Selected.List[Rol_UNK]); + Usr_PutHiddenParUsrCodAll (Gbl.Usrs.Selected.List[Rol_UNK]); } fprintf (Gbl.F.Out,""); if (LastRow < NumRows) @@ -2106,7 +2108,8 @@ 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 (ActSeeAccCrs,Gbl.Usrs.Selected.List[Rol_UNK]); + Usr_PutHiddenParUsrCodAll (Gbl.Usrs.Selected.List[Rol_UNK]); else // Gbl.Action.Act == ActSeeAccGbl { Par_PutHiddenParamUnsigned ("Role",(unsigned) Gbl.Stat.Role); diff --git a/swad_text.c b/swad_text.c index 7dba46640..f11c06ece 100644 --- a/swad_text.c +++ b/swad_text.c @@ -51204,25 +51204,25 @@ const char *Txt_Upload_file = "Fazer upload de arquivo"; #endif -const char *Txt_Upload_file_or_create_folder_in_FOLDER = // Warning: it is very important to include %s in the following sentences +const char *Txt_Upload_file_or_create_folder = #if L==1 // ca - "Añadir archivos o crear carpeta en %s"; // Necessita traduccio + "Añadir archivos o crear carpeta"; // Necessita traduccio #elif L==2 // de - "Datei uploaden oder Verzeichnis in %s erstellen"; + "Datei uploaden oder Verzeichnis erstellen"; #elif L==3 // en - "Upload files or create folder in %s"; + "Upload files or create folder"; #elif L==4 // es - "Añadir archivos o crear carpeta en %s"; + "Añadir archivos o crear carpeta"; #elif L==5 // fr - "Charger fichiers ou créer répertoire dans %s"; + "Charger fichiers ou créer répertoire"; #elif L==6 // gn - "Añadir archivos o crear carpeta en %s"; // Okoteve traducción + "Añadir archivos o crear carpeta"; // Okoteve traducción #elif L==7 // it - "Caricare file o creare cartella in %s"; + "Caricare file o creare cartella"; #elif L==8 // pl - "Upload file or create folder in %s"; // Potrzebujesz tlumaczenie + "Upload file or create folder"; // Potrzebujesz tlumaczenie #elif L==9 // pt - "Fazer upload de arquivos ou criar diretório em %s"; + "Fazer upload de arquivos ou criar diretório"; #endif const char *Txt_Upload_files = diff --git a/swad_user.c b/swad_user.c index a9cb5c1fb..3e874461c 100644 --- a/swad_user.c +++ b/swad_user.c @@ -5643,14 +5643,16 @@ 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 (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 *****/ Par_PutHiddenParamChar ("MultiUsrs",'Y'); /***** 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 (NextAction,Usr_ParamUsrCod[Rol_UNK],ListUsrCods); + Ses_InsertHiddenParInDB (Usr_ParamUsrCod[Rol_UNK],ListUsrCods); else Par_PutHiddenParamString (Usr_ParamUsrCod[Rol_UNK],ListUsrCods); } @@ -5670,8 +5672,12 @@ 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], Usr_MAX_BYTES_LIST_ENCRYPTED_USR_CODS,true); } diff --git a/swad_user.h b/swad_user.h index 5a4769fa8..a920a70c6 100644 --- a/swad_user.h +++ b/swad_user.h @@ -411,7 +411,8 @@ bool Usr_GetIfShowBigList (unsigned NumUsrs, void (*FuncParams) (void), const char *OnSubmit); -void Usr_PutHiddenParUsrCodAll (Act_Action_t NextAction,const char *ListUsrCods); +// 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); bool Usr_FindUsrCodInListOfSelectedUsrs (const char *EncryptedUsrCodToFind); diff --git a/swad_zip.c b/swad_zip.c index 03bc472f3..0f4ceb1c1 100644 --- a/swad_zip.c +++ b/swad_zip.c @@ -132,7 +132,8 @@ void ZIP_PutLinkToCreateZIPAsgWrk (void) static void ZIP_PutLinkToCreateZIPAsgWrkParams (void) { - Usr_PutHiddenParUsrCodAll (ActAdmAsgWrkCrs,Gbl.Usrs.Selected.List[Rol_UNK]); + // 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'); Par_PutHiddenParamChar ("CreateZIP",'Y'); @@ -366,9 +367,13 @@ void ZIP_PutButtonToDownloadZIPOfAFolder (const char *PathInTree,const char *Fil extern const char *Txt_Create_ZIP_file; Frm_StartForm (ZIP_ActZIPFolder[Gbl.FileBrowser.Type]); + /* Brw_PutParamsFileBrowser (ZIP_ActZIPFolder[Gbl.FileBrowser.Type], PathInTree,FileName, Brw_IS_FOLDER,-1L); + */ + Brw_PutParamsFileBrowser (PathInTree,FileName, + Brw_IS_FOLDER,-1L); Frm_LinkFormSubmit (Txt_Create_ZIP_file,The_ClassFormInBox[Gbl.Prefs.Theme],NULL); fprintf (Gbl.F.Out,"