mirror of https://github.com/acanas/swad-core.git
Version18.118.2
This commit is contained in:
parent
f61c09a5ec
commit
baa180c504
|
@ -497,12 +497,6 @@ 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);
|
||||
*/
|
||||
Brw_PutParamsFileBrowser (Brw_INTERNAL_NAME_ROOT_FOLDER_ASSIGNMENTS,
|
||||
Asg->Folder,
|
||||
Brw_IS_FOLDER,-1L);
|
||||
|
|
|
@ -448,10 +448,11 @@ En OpenSWAD:
|
|||
ps2pdf source.ps destination.pdf
|
||||
*/
|
||||
|
||||
#define Log_PLATFORM_VERSION "SWAD 18.118.1 (2019-04-22)"
|
||||
#define Log_PLATFORM_VERSION "SWAD 18.118.2 (2019-04-22)"
|
||||
#define CSS_FILE "swad18.112.1.css"
|
||||
#define JS_FILE "swad18.116.5.js"
|
||||
/*
|
||||
Version 18.118.2: Apr 22, 2019 Removed unused code related to hidden_params table. (242545 lines)
|
||||
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)
|
||||
|
|
|
@ -2275,20 +2275,10 @@ 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)
|
||||
{
|
||||
|
@ -5931,11 +5921,6 @@ 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);
|
||||
|
@ -5971,11 +5956,6 @@ 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);
|
||||
|
@ -6203,13 +6183,8 @@ static void Brw_PutIconFileWithLinkToViewMetadata (unsigned Size,
|
|||
{
|
||||
extern const char *Txt_View_data_of_FILE_OR_LINK_X;
|
||||
|
||||
/***** Start form *****/
|
||||
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);
|
||||
|
@ -6218,14 +6193,12 @@ static void Brw_PutIconFileWithLinkToViewMetadata (unsigned Size,
|
|||
snprintf (Gbl.Title,sizeof (Gbl.Title),
|
||||
Txt_View_data_of_FILE_OR_LINK_X,
|
||||
FileNameToShow);
|
||||
|
||||
/* Link to the form and to the file */
|
||||
Frm_LinkFormSubmit (Gbl.Title,Gbl.FileBrowser.TxtStyle,NULL);
|
||||
|
||||
/***** Icon depending on the file extension *****/
|
||||
Brw_PutIconFile (Size,FileMetadata->FileType,FileMetadata->FilFolLnkName);
|
||||
|
||||
/* End link and form */
|
||||
/***** End link and form *****/
|
||||
fprintf (Gbl.F.Out,"</a>");
|
||||
Frm_EndForm ();
|
||||
}
|
||||
|
@ -6302,11 +6275,6 @@ 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);
|
||||
}
|
||||
|
@ -6356,11 +6324,6 @@ static void Brw_WriteFileName (unsigned Level,bool IsPublic,
|
|||
fprintf (Gbl.F.Out,"<div class=\"FILENAME\">");
|
||||
|
||||
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);
|
||||
|
||||
|
@ -6615,12 +6578,6 @@ 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);
|
||||
|
@ -6761,12 +6718,6 @@ 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);
|
||||
|
@ -8434,12 +8385,6 @@ 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);
|
||||
|
@ -8502,12 +8447,6 @@ 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);
|
||||
|
@ -8520,12 +8459,6 @@ 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);
|
||||
|
@ -8561,12 +8494,6 @@ 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);
|
||||
|
@ -8593,12 +8520,6 @@ 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);
|
||||
|
@ -8633,12 +8554,6 @@ 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);
|
||||
|
@ -9633,12 +9548,6 @@ 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);
|
||||
|
@ -10155,13 +10064,7 @@ 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);
|
||||
*/
|
||||
ActSeeMyMrkGrp);
|
||||
Brw_PutParamsFileBrowser (FileMetadata->PathInTreeUntilFilFolLnk,
|
||||
FileMetadata->FilFolLnkName,
|
||||
FileMetadata->FileType,-1L);
|
||||
|
@ -10218,13 +10121,7 @@ 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);
|
||||
*/
|
||||
ActSeeMyMrkGrp);
|
||||
Brw_PutParamsFileBrowser (Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk,
|
||||
Gbl.FileBrowser.FilFolLnkName,
|
||||
FileType,-1L);
|
||||
|
@ -12241,16 +12138,6 @@ 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,
|
||||
FileMetadata.FileType == Brw_IS_FOLDER ? FileMetadata.FilFolLnkName :
|
||||
NULL,
|
||||
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 :
|
||||
|
|
|
@ -247,11 +247,6 @@ 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);
|
||||
|
||||
|
|
10
swad_mark.c
10
swad_mark.c
|
@ -145,11 +145,6 @@ 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 ();
|
||||
|
@ -176,11 +171,6 @@ 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 ();
|
||||
|
|
|
@ -366,11 +366,6 @@ 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);
|
||||
|
|
Loading…
Reference in New Issue