diff --git a/swad_changelog.h b/swad_changelog.h index 69382255..e2e76be9 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -189,13 +189,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.109.1 (2016-12-27)" +#define Log_PLATFORM_VERSION "SWAD 16.110 (2016-12-27)" #define CSS_FILE "swad16.108.css" #define JS_FILE "swad16.101.js" // Number of lines (includes comments but not blank lines) has been got with the following command: // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*?.h sql/swad*.sql | tail -1 /* + Version 16.110: Dec 27, 2016 Code refactoring in file browsers. (211340 lines) Version 16.109.1: Dec 27, 2016 Code refactoring in file browsers. (211460 lines) Version 16.109: Dec 27, 2016 Code refactoring in file browsers. (211458 lines) Version 16.108: Dec 27, 2016 Changes in layout. diff --git a/swad_file_browser.c b/swad_file_browser.c index 5e5e6445..6c533688 100644 --- a/swad_file_browser.c +++ b/swad_file_browser.c @@ -1475,12 +1475,12 @@ static void Brw_PutParamsContextualLink (void); static void Brw_PutCheckboxFullTree (void); static void Brw_PutParamsFullTree (void); -static void Brw_PutHiddenParamFullTreeIfSelected (void); static bool Brw_GetFullTreeFromForm (void); -static bool Brw_GetIfGroupFileBrowser (void); +bool Brw_GetIfGroupFileBrowser (void); +bool Brw_GetIfCrsAssigWorksFileBrowser (void); + static bool Brw_GetIfUsrAssigWorksFileBrowser (void); -static bool Brw_GetIfCrsAssigWorksFileBrowser (void); static bool Brw_GetIfBriefcaseFileBrowser (void); static void Brw_GetAndUpdateDateLastAccFileBrowser (void); @@ -2410,7 +2410,8 @@ long Brw_GetParamFilCod (void) /** Put hidden params. with the path in the tree and the name of file/folder */ /*****************************************************************************/ -void Brw_PutParamsPathAndFile (Brw_FileType_t FileType,const char *PathInTree,const char *FileFolderName) +void Brw_PutParamsPathAndFile (Brw_FileType_t FileType, + const char *PathInTree,const char *FileFolderName) { Par_PutHiddenParamString ("Path",PathInTree); Par_PutHiddenParamString (Brw_FileTypeParamName[FileType],FileFolderName); @@ -4665,7 +4666,7 @@ static void Brw_PutParamsFullTree (void) /********* Put hidden parameter "full tree" if full tree is selected *********/ /*****************************************************************************/ -static void Brw_PutHiddenParamFullTreeIfSelected (void) +void Brw_PutHiddenParamFullTreeIfSelected (void) { if (Gbl.FileBrowser.FullTree) Par_PutHiddenParamChar ("FullTree",'Y'); @@ -4688,7 +4689,7 @@ static bool Brw_GetFullTreeFromForm (void) /********* Get if the current file browser is a group file browser ***********/ /*****************************************************************************/ -static bool Brw_GetIfGroupFileBrowser (void) +bool Brw_GetIfGroupFileBrowser (void) { switch (Gbl.FileBrowser.Type) { @@ -4708,22 +4709,6 @@ static bool Brw_GetIfGroupFileBrowser (void) /****** Get if the current file browser is course assignments or works *******/ /*****************************************************************************/ -static bool Brw_GetIfCrsAssigWorksFileBrowser (void) - { - switch (Gbl.FileBrowser.Type) - { - case Brw_ADMI_ASSIG_CRS: // Course assignments - case Brw_ADMI_WORKS_CRS: // Course works - return true; - default: - return false; - } - } - -/*****************************************************************************/ -/****** Get if the current file browser is course assignments or works *******/ -/*****************************************************************************/ - static bool Brw_GetIfBriefcaseFileBrowser (void) { return (Gbl.FileBrowser.Type == Brw_ADMI_BRIEF_USR); @@ -4745,6 +4730,22 @@ static bool Brw_GetIfUsrAssigWorksFileBrowser (void) } } +/*****************************************************************************/ +/****** Get if the current file browser is course assignments or works *******/ +/*****************************************************************************/ + +bool Brw_GetIfCrsAssigWorksFileBrowser (void) + { + switch (Gbl.FileBrowser.Type) + { + case Brw_ADMI_ASSIG_CRS: // Course assignments + case Brw_ADMI_WORKS_CRS: // Course works + return true; + default: + return false; + } + } + /*****************************************************************************/ /******** Create a temporary public directory used to download files *********/ /*****************************************************************************/ @@ -5421,14 +5422,8 @@ static void Brw_PutIconRemoveFile (const char *PathInTree,const char *FileName,c { /***** Form to remove a file *****/ Act_FormStart (Brw_ActAskRemoveFile[Gbl.FileBrowser.Type]); - if (Brw_GetIfGroupFileBrowser ()) - Grp_PutParamGrpCod (Gbl.CurrentCrs.Grps.GrpCod); - else if (Brw_GetIfCrsAssigWorksFileBrowser ()) - { - Usr_PutHiddenParUsrCodAll (Brw_ActAskRemoveFile[Gbl.FileBrowser.Type],Gbl.Usrs.Select.All); - Usr_PutParamOtherUsrCodEncrypted (); - } - Brw_ParamListFiles (Gbl.FileBrowser.FileType,PathInTree,FileName); + Brw_PutParamsFileBrowser (Brw_ActAskRemoveFile[Gbl.FileBrowser.Type]); + Brw_PutParamsPathAndFile (Gbl.FileBrowser.FileType,PathInTree,FileName); sprintf (Gbl.Title,Txt_Remove_FILE_OR_LINK_X,FileNameToShow); fprintf (Gbl.F.Out,"",Gbl.RowEvenOdd); Act_FormStart (Brw_ActShow[Gbl.FileBrowser.Type]); - if (Brw_GetIfGroupFileBrowser ()) - Grp_PutParamGrpCod (Gbl.CurrentCrs.Grps.GrpCod); - Brw_ParamListFiles (Gbl.FileBrowser.FileType,PathInTree,FileName); + Brw_PutParamsFileBrowser (ActUnk); + Brw_PutParamsPathAndFile (Gbl.FileBrowser.FileType,PathInTree,FileName); sprintf (Gbl.Title,Txt_Show_FOLDER_FILE_OR_LINK_X,FileNameToShow); fprintf (Gbl.F.Out,"",Gbl.RowEvenOdd); Act_FormStart (Brw_ActHide[Gbl.FileBrowser.Type]); - if (Brw_GetIfGroupFileBrowser ()) - Grp_PutParamGrpCod (Gbl.CurrentCrs.Grps.GrpCod); - Brw_ParamListFiles (Gbl.FileBrowser.FileType,PathInTree,FileName); + Brw_PutParamsFileBrowser (ActUnk); + Brw_PutParamsPathAndFile (Gbl.FileBrowser.FileType,PathInTree,FileName); sprintf (Gbl.Title,Txt_Hide_FOLDER_FILE_OR_LINK_X,FileNameToShow); fprintf (Gbl.F.Out,"FilCod); /***** Name and link of the file or folder *****/ @@ -5900,14 +5858,8 @@ static void Brw_WriteFileName (unsigned Level,bool IsPublic, if (Gbl.FileBrowser.ICanEditFileOrFolder) // Can I rename this folder? { Act_FormStart (Brw_ActRenameFolder[Gbl.FileBrowser.Type]); - if (Brw_GetIfGroupFileBrowser ()) - Grp_PutParamGrpCod (Gbl.CurrentCrs.Grps.GrpCod); - else if (Brw_GetIfCrsAssigWorksFileBrowser ()) - { - Usr_PutHiddenParUsrCodAll (Brw_ActRenameFolder[Gbl.FileBrowser.Type],Gbl.Usrs.Select.All); - Usr_PutParamOtherUsrCodEncrypted (); - } - Brw_ParamListFiles (Brw_IS_FOLDER,PathInTree,FileName); + Brw_PutParamsFileBrowser (Brw_ActRenameFolder[Gbl.FileBrowser.Type]); + Brw_PutParamsPathAndFile (Brw_IS_FOLDER,PathInTree,FileName); } /***** Write name of the folder *****/ @@ -5950,14 +5902,8 @@ static void Brw_WriteFileName (unsigned Level,bool IsPublic, fprintf (Gbl.F.Out,"\" style=\"width:99%%;\"> "); Act_FormStart (Brw_ActDowFile[Gbl.FileBrowser.Type]); - if (Brw_GetIfGroupFileBrowser ()) - Grp_PutParamGrpCod (Gbl.CurrentCrs.Grps.GrpCod); - else if (Brw_GetIfCrsAssigWorksFileBrowser ()) - { - Usr_PutHiddenParUsrCodAll (Brw_ActDowFile[Gbl.FileBrowser.Type],Gbl.Usrs.Select.All); - Usr_PutParamOtherUsrCodEncrypted (); - } - Brw_ParamListFiles (Gbl.FileBrowser.FileType,PathInTree,FileName); + Brw_PutParamsFileBrowser (Brw_ActDowFile[Gbl.FileBrowser.Type]); + Brw_PutParamsPathAndFile (Gbl.FileBrowser.FileType,PathInTree,FileName); /* Link to the form and to the file */ sprintf (Gbl.Title,(Gbl.FileBrowser.Type == Brw_SHOW_MARKS_CRS || @@ -6035,16 +5981,6 @@ void Brw_CreateTmpPublicLinkToPrivateFile (const char *FullPathIncludingFile, Lay_ShowErrorAndExit ("Can not create temporary link."); } -/*****************************************************************************/ -/***************** Write parameters of a row of file list ********************/ -/*****************************************************************************/ - -void Brw_ParamListFiles (Brw_FileType_t FileType,const char *PathInTree,const char *FileName) - { - Brw_PutParamsPathAndFile (FileType,PathInTree,FileName); - Brw_PutHiddenParamFullTreeIfSelected (); - } - /*****************************************************************************/ /************ Write start and end dates of a folder of assignment ************/ /*****************************************************************************/ @@ -6209,14 +6145,8 @@ void Brw_AskRemFileFromTree (void) { /***** Form to ask for confirmation to remove a file *****/ Act_FormStart (Brw_ActRemoveFile[Gbl.FileBrowser.Type]); - if (Brw_GetIfGroupFileBrowser ()) - Grp_PutParamGrpCod (Gbl.CurrentCrs.Grps.GrpCod); - else if (Brw_GetIfCrsAssigWorksFileBrowser ()) - { - Usr_PutHiddenParUsrCodAll (Brw_ActRemoveFile[Gbl.FileBrowser.Type],Gbl.Usrs.Select.All); - Usr_PutParamOtherUsrCodEncrypted (); - } - Brw_ParamListFiles (Gbl.FileBrowser.FileType,Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk,Gbl.FileBrowser.FilFolLnkName); + Brw_PutParamsFileBrowser (Brw_ActRemoveFile[Gbl.FileBrowser.Type]); + Brw_PutParamsPathAndFile (Gbl.FileBrowser.FileType,Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk,Gbl.FileBrowser.FilFolLnkName); /* Show question */ Brw_GetFileNameToShow (Gbl.FileBrowser.FileType,Gbl.FileBrowser.Level, @@ -6354,14 +6284,10 @@ static void Brw_AskConfirmRemoveFolderNotEmpty (void) /***** Form to remove a not empty folder *****/ Act_FormStart (Brw_ActRemoveFolderNotEmpty[Gbl.FileBrowser.Type]); - if (Brw_GetIfGroupFileBrowser ()) - Grp_PutParamGrpCod (Gbl.CurrentCrs.Grps.GrpCod); - else if (Brw_GetIfCrsAssigWorksFileBrowser ()) - { - Usr_PutHiddenParUsrCodAll (Brw_ActRemoveFolderNotEmpty[Gbl.FileBrowser.Type],Gbl.Usrs.Select.All); - Usr_PutParamOtherUsrCodEncrypted (); - } - Brw_ParamListFiles (Brw_IS_FOLDER,Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk,Gbl.FileBrowser.FilFolLnkName); + Brw_PutParamsFileBrowser (Brw_ActRemoveFolderNotEmpty[Gbl.FileBrowser.Type]); + Brw_PutParamsPathAndFile (Brw_IS_FOLDER, + Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk, + Gbl.FileBrowser.FilFolLnkName); sprintf (Gbl.Message,Txt_Do_you_really_want_to_remove_the_folder_X, Gbl.FileBrowser.FilFolLnkName); Lay_ShowAlert (Lay_WARNING,Gbl.Message); @@ -7940,14 +7866,8 @@ static void Brw_PutFormToCreateAFolder (const char *FileNameToShow) /***** Start form *****/ Act_FormStart (Brw_ActCreateFolder[Gbl.FileBrowser.Type]); - if (Brw_GetIfGroupFileBrowser ()) - Grp_PutParamGrpCod (Gbl.CurrentCrs.Grps.GrpCod); - else if (Brw_GetIfCrsAssigWorksFileBrowser ()) - { - Usr_PutHiddenParUsrCodAll (Brw_ActCreateFolder[Gbl.FileBrowser.Type],Gbl.Usrs.Select.All); - Usr_PutParamOtherUsrCodEncrypted (); - } - Brw_ParamListFiles (Brw_IS_FOLDER,Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk,Gbl.FileBrowser.FilFolLnkName); + Brw_PutParamsFileBrowser (Brw_ActCreateFolder[Gbl.FileBrowser.Type]); + Brw_PutParamsPathAndFile (Brw_IS_FOLDER,Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk,Gbl.FileBrowser.FilFolLnkName); /***** Start frame *****/ Lay_StartRoundFrame (NULL,Txt_Create_folder,NULL,NULL); @@ -8007,14 +7927,10 @@ static void Brw_PutFormToUploadFilesUsingDropzone (const char *FileNameToShow) Gbl.Prefs.IconsURL); Par_PutHiddenParamLong ("act",Act_Actions[Brw_ActUploadFileDropzone[Gbl.FileBrowser.Type]].ActCod); Par_PutHiddenParamString ("ses",Gbl.Session.Id); - if (Brw_GetIfGroupFileBrowser ()) - Grp_PutParamGrpCod (Gbl.CurrentCrs.Grps.GrpCod); - else if (Brw_GetIfCrsAssigWorksFileBrowser ()) - { - Usr_PutHiddenParUsrCodAll (Brw_ActUploadFileDropzone[Gbl.FileBrowser.Type],Gbl.Usrs.Select.All); - Usr_PutParamOtherUsrCodEncrypted (); - } - Brw_ParamListFiles (Brw_IS_FOLDER,Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk,Gbl.FileBrowser.FilFolLnkName); + Brw_PutParamsFileBrowser (Brw_ActUploadFileDropzone[Gbl.FileBrowser.Type]); + Brw_PutParamsPathAndFile (Brw_IS_FOLDER, + Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk, + Gbl.FileBrowser.FilFolLnkName); fprintf (Gbl.F.Out,"