Marown/swad-core
Marown/swad-core
1
0
Fork 0
mirror of https://github.com/acanas/swad-core.git synced 2024-06-16 05:34:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version18.117.1

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2019-04-21 23:05:55 +02:00
parent d1f7e3fa7c
commit 1b3a2651c6
9 changed files with 132 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
.cproject
View File

@ -1,42 +1,82 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage"> <?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
<storageModule moduleId="org.eclipse.cdt.core.settings"> <storageModule moduleId="org.eclipse.cdt.core.settings">
<cconfiguration id="cdt.managedbuild.toolchain.gnu.base.1290182859">
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.toolchain.gnu.base.1290182859" moduleId="org.eclipse.cdt.core.settings" name="Default"> <cconfiguration id="cdt.managedbuild.toolchain.gnu.base.355361470">
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.toolchain.gnu.base.355361470" moduleId="org.eclipse.cdt.core.settings" name="Default">
<externalSettings/> <externalSettings/>
<extensions> <extensions>
<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/> <extension id="org.eclipse.cdt.core.GNU_ELF" point="org.eclipse.cdt.core.BinaryParser"/>
<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/> <extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/> <extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
</extensions> </extensions>
</storageModule> </storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0"> <storageModule moduleId="cdtBuildSystem" version="4.0.0">
<configuration buildProperties="" id="cdt.managedbuild.toolchain.gnu.base.1290182859" name="Default" parent="org.eclipse.cdt.build.core.emptycfg">
<folderInfo id="cdt.managedbuild.toolchain.gnu.base.1290182859.1298913177" name="/" resourcePath=""> <configuration buildProperties="" id="cdt.managedbuild.toolchain.gnu.base.355361470" name="Default" parent="org.eclipse.cdt.build.core.emptycfg">
<toolChain id="cdt.managedbuild.toolchain.gnu.base.848402909" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.base">
<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="cdt.managedbuild.target.gnu.platform.base.1738387684" name="Debug Platform" osList="linux,hpux,aix,qnx" superClass="cdt.managedbuild.target.gnu.platform.base"/> <folderInfo id="cdt.managedbuild.toolchain.gnu.base.355361470.1146655474" name="/" resourcePath="">
<builder id="cdt.managedbuild.target.gnu.builder.base.2018601808" managedBuildOn="false" name="Gnu Make Builder.Default" superClass="cdt.managedbuild.target.gnu.builder.base"/>
<tool id="cdt.managedbuild.tool.gnu.archiver.base.328540180" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/> <toolChain id="cdt.managedbuild.toolchain.gnu.base.381030851" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.base">
<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.base.1457314245" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base"/>
<tool id="cdt.managedbuild.tool.gnu.c.compiler.base.951726113" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.base"/> <targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.GNU_ELF" id="cdt.managedbuild.target.gnu.platform.base.420133749" name="Debug Platform" osList="linux,hpux,aix,qnx" superClass="cdt.managedbuild.target.gnu.platform.base"/>
<tool id="cdt.managedbuild.tool.gnu.c.linker.base.392851280" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.base"/>
<tool id="cdt.managedbuild.tool.gnu.cpp.linker.base.622860007" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.base"/> <builder id="cdt.managedbuild.target.gnu.builder.base.2101091589" managedBuildOn="false" name="Gnu Make Builder.Default" superClass="cdt.managedbuild.target.gnu.builder.base"/>
<tool id="cdt.managedbuild.tool.gnu.assembler.base.588734153" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.base"/>
<tool id="cdt.managedbuild.tool.gnu.archiver.base.663680588" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.base.457979028" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base"/>
<tool id="cdt.managedbuild.tool.gnu.c.compiler.base.418929804" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.base"/>
<tool id="cdt.managedbuild.tool.gnu.c.linker.base.760843449" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.base"/>
<tool id="cdt.managedbuild.tool.gnu.cpp.linker.base.258679126" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.base"/>
<tool id="cdt.managedbuild.tool.gnu.assembler.base.1339908932" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.base"/>
</toolChain> </toolChain>
</folderInfo> </folderInfo>
</configuration> </configuration>
</storageModule> </storageModule>
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/> <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
</cconfiguration> </cconfiguration>
</storageModule> </storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<project id="swad-core.null.784867548" name="swad-core"/>
</storageModule>
<storageModule moduleId="scannerConfiguration"> <storageModule moduleId="scannerConfiguration">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/> <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
</storageModule> </storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<project id="swad-core.null.1175972262" name="swad-core"/>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/> <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
</cproject> </cproject>

12
.settings/language.settings.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<project> <project>
<configuration id="cdt.managedbuild.toolchain.gnu.base.1290182859" name="Default"> <configuration id="cdt.managedbuild.toolchain.gnu.base.355361470" name="Default">
<extension point="org.eclipse.cdt.core.LanguageSettingsProvider"> <extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
@ -9,9 +9,15 @@
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuildCommandParser" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser" keep-relative-paths="false" name="CDT GCC Build Output Parser" parameter="(gcc)|([gc]\+\+)|(clang)" prefer-non-shared="true"/> <provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuildCommandParser" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser" keep-relative-paths="false" name="CDT GCC Build Output Parser" parameter="(g?cc)|([gc]\+\+)|(clang)" prefer-non-shared="true"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" ref="shared-provider"/> <provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-525352425879766662" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/>
</provider>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>

2
swad_assignment.c
View File

@ -497,7 +497,7 @@ static void Asg_WriteAssignmentFolder (struct Assignment *Asg,bool PrintView)
{ {
/* Form to create a new file or folder */ /* Form to create a new file or folder */
Frm_StartForm (ActFrmCreAsgUsr); Frm_StartForm (ActFrmCreAsgUsr);
Brw_PutExplicitParamsFileBrowser (ActUnk, Brw_PutParamsFileBrowser (ActUnk,
Brw_INTERNAL_NAME_ROOT_FOLDER_ASSIGNMENTS, Brw_INTERNAL_NAME_ROOT_FOLDER_ASSIGNMENTS,
Asg->Folder, Asg->Folder,
Brw_IS_FOLDER,-1L); Brw_IS_FOLDER,-1L);

3
swad_changelog.h
View File

@ -448,10 +448,11 @@ En OpenSWAD:
ps2pdf source.ps destination.pdf ps2pdf source.ps destination.pdf
*/ */
#define Log_PLATFORM_VERSION "SWAD 18.117 (2019-04-20)" #define Log_PLATFORM_VERSION "SWAD 18.117.1 (2019-04-21)"
#define CSS_FILE "swad18.112.1.css" #define CSS_FILE "swad18.112.1.css"
#define JS_FILE "swad18.116.5.js" #define JS_FILE "swad18.116.5.js"
/* /*
Version 18.117.1: Apr 21, 2019 Changed the behaviour of removing a file/folder in file browser. (242647 lines)
Version 18.117: Apr 21, 2019 Changed the behaviour of hiding/showing a file browser row. (242698 lines) Version 18.117: Apr 21, 2019 Changed the behaviour of hiding/showing a file browser row. (242698 lines)
Version 18.116.10:Apr 20, 2019 Changed the behaviour of hiding/showing a survey. (242802 lines) Version 18.116.10:Apr 20, 2019 Changed the behaviour of hiding/showing a survey. (242802 lines)
Version 18.116.9: Apr 20, 2019 Changed the behaviour of hiding/showing a game. (242841 lines) Version 18.116.9: Apr 20, 2019 Changed the behaviour of hiding/showing a game. (242841 lines)

79
swad_file_browser.c
View File

@ -1262,7 +1262,7 @@ static void Brw_PutIconsRemoveCopyPaste (unsigned Level,
const char *FileName,const char *FileNameToShow); const char *FileName,const char *FileNameToShow);
static bool Brw_CheckIfCanPasteIn (unsigned Level); static bool Brw_CheckIfCanPasteIn (unsigned Level);
static void Brw_PutIconRemove (const char PathInTree[PATH_MAX + 1], static void Brw_PutIconRemove (const char PathInTree[PATH_MAX + 1],
const char *FileName,const char *FileNameToShow); const char *FileName);
static void Brw_PutIconCopy (const char PathInTree[PATH_MAX + 1], static void Brw_PutIconCopy (const char PathInTree[PATH_MAX + 1],
const char *FileName,const char *FileNameShow); const char *FileName,const char *FileNameShow);
static void Brw_PutIconPaste (unsigned Level,const char PathInTree[PATH_MAX + 1], static void Brw_PutIconPaste (unsigned Level,const char PathInTree[PATH_MAX + 1],
@ -2284,12 +2284,12 @@ long Brw_GetParamFilCod (void)
static void Brw_PutImplicitParamsFileBrowser (void) static void Brw_PutImplicitParamsFileBrowser (void)
{ {
Brw_PutExplicitParamsFileBrowser (ActUnk, Brw_PutParamsFileBrowser (ActUnk,
Brw_PathInTree,Brw_FileName, Brw_PathInTree,Brw_FileName,
Gbl.FileBrowser.FileType,-1L); Gbl.FileBrowser.FileType,-1L);
} }
void Brw_PutExplicitParamsFileBrowser (Act_Action_t NextAction, void Brw_PutParamsFileBrowser (Act_Action_t NextAction,
const char *PathInTree,const char *FileFolderName, const char *PathInTree,const char *FileFolderName,
Brw_FileType_t FileType,long FilCod) Brw_FileType_t FileType,long FilCod)
{ {
@ -5711,7 +5711,7 @@ static void Brw_PutIconsRemoveCopyPaste (unsigned Level,
const char *FileName,const char *FileNameToShow) const char *FileName,const char *FileNameToShow)
{ {
/***** Icon to remove folder, file or link *****/ /***** Icon to remove folder, file or link *****/
Brw_PutIconRemove (PathInTree,FileName,FileNameToShow); Brw_PutIconRemove (PathInTree,FileName);
/***** Icon to copy *****/ /***** Icon to copy *****/
Brw_PutIconCopy (PathInTree,FileName,FileNameToShow); Brw_PutIconCopy (PathInTree,FileName,FileNameToShow);
@ -5768,11 +5768,8 @@ static bool Brw_CheckIfCanPasteIn (unsigned Level)
/*****************************************************************************/ /*****************************************************************************/
static void Brw_PutIconRemove (const char PathInTree[PATH_MAX + 1], static void Brw_PutIconRemove (const char PathInTree[PATH_MAX + 1],
const char *FileName,const char *FileNameToShow) const char *FileName)
{ {
extern const char *Txt_Remove_FILE_OR_LINK_X;
extern const char *Txt_Remove_folder_X;
fprintf (Gbl.F.Out,"<td class=\"BM%u\">",Gbl.RowEvenOdd); fprintf (Gbl.F.Out,"<td class=\"BM%u\">",Gbl.RowEvenOdd);
if (Gbl.FileBrowser.ICanEditFileOrFolder) // Can I remove this? if (Gbl.FileBrowser.ICanEditFileOrFolder) // Can I remove this?
@ -5781,27 +5778,17 @@ static void Brw_PutIconRemove (const char PathInTree[PATH_MAX + 1],
case Brw_IS_FILE: case Brw_IS_FILE:
case Brw_IS_LINK: case Brw_IS_LINK:
/***** Form to remove a file or link *****/ /***** Form to remove a file or link *****/
Frm_StartForm (Brw_ActAskRemoveFile[Gbl.FileBrowser.Type]); Brw_PathInTree = PathInTree;
Brw_PutExplicitParamsFileBrowser (Brw_ActAskRemoveFile[Gbl.FileBrowser.Type], Brw_FileName = FileName;
PathInTree,FileName, Ico_PutContextualIconToRemove (Brw_ActAskRemoveFile[Gbl.FileBrowser.Type],
Gbl.FileBrowser.FileType,-1L); Brw_PutImplicitParamsFileBrowser);
snprintf (Gbl.Title,sizeof (Gbl.Title),
Txt_Remove_FILE_OR_LINK_X,
FileNameToShow);
Ico_PutIconLink ("trash.svg",Gbl.Title);
Frm_EndForm ();
break; break;
case Brw_IS_FOLDER: case Brw_IS_FOLDER:
/***** Form to remove a folder *****/ /***** Form to remove a folder *****/
Frm_StartForm (Brw_ActRemoveFolder[Gbl.FileBrowser.Type]); Brw_PathInTree = PathInTree;
Brw_PutExplicitParamsFileBrowser (Brw_ActRemoveFolder[Gbl.FileBrowser.Type], Brw_FileName = FileName;
PathInTree,FileName, Ico_PutContextualIconToRemove (Brw_ActRemoveFolder[Gbl.FileBrowser.Type],
Gbl.FileBrowser.FileType,-1L); Brw_PutImplicitParamsFileBrowser);
snprintf (Gbl.Title,sizeof (Gbl.Title),
Txt_Remove_folder_X,
FileNameToShow);
Ico_PutIconLink ("trash.svg",Gbl.Title);
Frm_EndForm ();
break; break;
default: default:
break; break;
@ -5824,7 +5811,7 @@ static void Brw_PutIconCopy (const char PathInTree[PATH_MAX + 1],
/***** Form to copy into the clipboard *****/ /***** Form to copy into the clipboard *****/
Frm_StartForm (Brw_ActCopy[Gbl.FileBrowser.Type]); Frm_StartForm (Brw_ActCopy[Gbl.FileBrowser.Type]);
Brw_PutExplicitParamsFileBrowser (Brw_ActCopy[Gbl.FileBrowser.Type], Brw_PutParamsFileBrowser (Brw_ActCopy[Gbl.FileBrowser.Type],
PathInTree,FileName, PathInTree,FileName,
Gbl.FileBrowser.FileType,-1L); Gbl.FileBrowser.FileType,-1L);
snprintf (Gbl.Title,sizeof (Gbl.Title), snprintf (Gbl.Title,sizeof (Gbl.Title),
@ -5855,7 +5842,7 @@ static void Brw_PutIconPaste (unsigned Level,const char PathInTree[PATH_MAX + 1]
{ {
/***** Form to paste the content of the clipboard *****/ /***** Form to paste the content of the clipboard *****/
Frm_StartForm (Brw_ActPaste[Gbl.FileBrowser.Type]); Frm_StartForm (Brw_ActPaste[Gbl.FileBrowser.Type]);
Brw_PutExplicitParamsFileBrowser (Brw_ActPaste[Gbl.FileBrowser.Type], Brw_PutParamsFileBrowser (Brw_ActPaste[Gbl.FileBrowser.Type],
PathInTree,FileName, PathInTree,FileName,
Brw_IS_FOLDER,-1L); Brw_IS_FOLDER,-1L);
snprintf (Gbl.Title,sizeof (Gbl.Title), snprintf (Gbl.Title,sizeof (Gbl.Title),
@ -5975,7 +5962,7 @@ static void Brw_PutIconToExpandFolder (const char *FileBrowserId,const char *Row
Frm_StartFormAnchorOnSubmit (Brw_ActExpandFolder[Gbl.FileBrowser.Type], Frm_StartFormAnchorOnSubmit (Brw_ActExpandFolder[Gbl.FileBrowser.Type],
FileBrowserId, FileBrowserId,
JavaScriptFuncToExpandFolder); // JavaScript function to unhide rows JavaScriptFuncToExpandFolder); // JavaScript function to unhide rows
Brw_PutExplicitParamsFileBrowser (Brw_ActExpandFolder[Gbl.FileBrowser.Type], Brw_PutParamsFileBrowser (Brw_ActExpandFolder[Gbl.FileBrowser.Type],
PathInTree,FileName, PathInTree,FileName,
Brw_IS_FOLDER,-1L); Brw_IS_FOLDER,-1L);
snprintf (Gbl.Title,sizeof (Gbl.Title), snprintf (Gbl.Title,sizeof (Gbl.Title),
@ -6015,7 +6002,7 @@ static void Brw_PutIconToContractFolder (const char *FileBrowserId,const char *R
Frm_StartFormAnchorOnSubmit (Brw_ActContractFolder[Gbl.FileBrowser.Type], Frm_StartFormAnchorOnSubmit (Brw_ActContractFolder[Gbl.FileBrowser.Type],
FileBrowserId, FileBrowserId,
JavaScriptFuncToContractFolder); // JavaScript function to hide rows JavaScriptFuncToContractFolder); // JavaScript function to hide rows
Brw_PutExplicitParamsFileBrowser (Brw_ActContractFolder[Gbl.FileBrowser.Type], Brw_PutParamsFileBrowser (Brw_ActContractFolder[Gbl.FileBrowser.Type],
PathInTree,FileName, PathInTree,FileName,
Brw_IS_FOLDER,-1L); Brw_IS_FOLDER,-1L);
snprintf (Gbl.Title,sizeof (Gbl.Title), snprintf (Gbl.Title,sizeof (Gbl.Title),
@ -6211,7 +6198,7 @@ static void Brw_PutIconFolderWithPlus (const char *FileBrowserId,const char *Row
/***** Form and icon *****/ /***** Form and icon *****/
Frm_StartForm (Brw_ActFormCreate[Gbl.FileBrowser.Type]); Frm_StartForm (Brw_ActFormCreate[Gbl.FileBrowser.Type]);
Brw_PutExplicitParamsFileBrowser (Brw_ActFormCreate[Gbl.FileBrowser.Type], Brw_PutParamsFileBrowser (Brw_ActFormCreate[Gbl.FileBrowser.Type],
PathInTree,FileName, PathInTree,FileName,
Brw_IS_FOLDER,-1L); Brw_IS_FOLDER,-1L);
snprintf (Gbl.Title,sizeof (Gbl.Title), snprintf (Gbl.Title,sizeof (Gbl.Title),
@ -6257,7 +6244,7 @@ static void Brw_PutIconFileWithLinkToViewMetadata (unsigned Size,
extern const char *Txt_View_data_of_FILE_OR_LINK_X; extern const char *Txt_View_data_of_FILE_OR_LINK_X;
Frm_StartForm (Brw_ActReqDatFile[Gbl.FileBrowser.Type]); Frm_StartForm (Brw_ActReqDatFile[Gbl.FileBrowser.Type]);
Brw_PutExplicitParamsFileBrowser (Brw_ActReqDatFile[Gbl.FileBrowser.Type], Brw_PutParamsFileBrowser (Brw_ActReqDatFile[Gbl.FileBrowser.Type],
NULL,NULL, NULL,NULL,
Brw_IS_UNKNOWN, // Not used Brw_IS_UNKNOWN, // Not used
FileMetadata->FilCod); FileMetadata->FilCod);
@ -6350,7 +6337,7 @@ static void Brw_WriteFileName (unsigned Level,bool IsPublic,
if (Gbl.FileBrowser.ICanEditFileOrFolder) // Can I rename this folder? if (Gbl.FileBrowser.ICanEditFileOrFolder) // Can I rename this folder?
{ {
Frm_StartForm (Brw_ActRenameFolder[Gbl.FileBrowser.Type]); Frm_StartForm (Brw_ActRenameFolder[Gbl.FileBrowser.Type]);
Brw_PutExplicitParamsFileBrowser (Brw_ActRenameFolder[Gbl.FileBrowser.Type], Brw_PutParamsFileBrowser (Brw_ActRenameFolder[Gbl.FileBrowser.Type],
PathInTree,FileName, PathInTree,FileName,
Brw_IS_FOLDER,-1L); Brw_IS_FOLDER,-1L);
} }
@ -6400,7 +6387,7 @@ static void Brw_WriteFileName (unsigned Level,bool IsPublic,
fprintf (Gbl.F.Out,"<div class=\"FILENAME\">"); fprintf (Gbl.F.Out,"<div class=\"FILENAME\">");
Frm_StartForm (Brw_ActDowFile[Gbl.FileBrowser.Type]); Frm_StartForm (Brw_ActDowFile[Gbl.FileBrowser.Type]);
Brw_PutExplicitParamsFileBrowser (Brw_ActDowFile[Gbl.FileBrowser.Type], Brw_PutParamsFileBrowser (Brw_ActDowFile[Gbl.FileBrowser.Type],
PathInTree,FileName, PathInTree,FileName,
Gbl.FileBrowser.FileType,-1L); Gbl.FileBrowser.FileType,-1L);
@ -6655,7 +6642,7 @@ void Brw_AskRemFileFromTree (void)
static void Brw_PutParamsRemFile (void) static void Brw_PutParamsRemFile (void)
{ {
Brw_PutExplicitParamsFileBrowser (Brw_ActRemoveFile[Gbl.FileBrowser.Type], Brw_PutParamsFileBrowser (Brw_ActRemoveFile[Gbl.FileBrowser.Type],
Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk, Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk,
Gbl.FileBrowser.FilFolLnkName, Gbl.FileBrowser.FilFolLnkName,
Gbl.FileBrowser.FileType,-1L); Gbl.FileBrowser.FileType,-1L);
@ -6796,7 +6783,7 @@ static void Brw_AskConfirmRemoveFolderNotEmpty (void)
static void Brw_PutParamsRemFolder (void) static void Brw_PutParamsRemFolder (void)
{ {
Brw_PutExplicitParamsFileBrowser (Brw_ActRemoveFolderNotEmpty[Gbl.FileBrowser.Type], Brw_PutParamsFileBrowser (Brw_ActRemoveFolderNotEmpty[Gbl.FileBrowser.Type],
Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk, Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk,
Gbl.FileBrowser.FilFolLnkName, Gbl.FileBrowser.FilFolLnkName,
Brw_IS_FOLDER,-1L); Brw_IS_FOLDER,-1L);
@ -8464,7 +8451,7 @@ static void Brw_PutFormToCreateAFolder (const char FileNameToShow[NAME_MAX + 1])
/***** Start form *****/ /***** Start form *****/
Frm_StartForm (Brw_ActCreateFolder[Gbl.FileBrowser.Type]); Frm_StartForm (Brw_ActCreateFolder[Gbl.FileBrowser.Type]);
Brw_PutExplicitParamsFileBrowser (Brw_ActCreateFolder[Gbl.FileBrowser.Type], Brw_PutParamsFileBrowser (Brw_ActCreateFolder[Gbl.FileBrowser.Type],
Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk, Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk,
Gbl.FileBrowser.FilFolLnkName, Gbl.FileBrowser.FilFolLnkName,
Brw_IS_FOLDER,-1L); Brw_IS_FOLDER,-1L);
@ -8527,7 +8514,7 @@ static void Brw_PutFormToUploadFilesUsingDropzone (const char *FileNameToShow)
Cfg_URL_ICON_PUBLIC); Cfg_URL_ICON_PUBLIC);
Par_PutHiddenParamLong ("act",Act_GetActCod (Brw_ActUploadFileDropzone[Gbl.FileBrowser.Type])); Par_PutHiddenParamLong ("act",Act_GetActCod (Brw_ActUploadFileDropzone[Gbl.FileBrowser.Type]));
Par_PutHiddenParamString ("ses",Gbl.Session.Id); Par_PutHiddenParamString ("ses",Gbl.Session.Id);
Brw_PutExplicitParamsFileBrowser (Brw_ActUploadFileDropzone[Gbl.FileBrowser.Type], Brw_PutParamsFileBrowser (Brw_ActUploadFileDropzone[Gbl.FileBrowser.Type],
Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk, Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk,
Gbl.FileBrowser.FilFolLnkName, Gbl.FileBrowser.FilFolLnkName,
Brw_IS_FOLDER,-1L); Brw_IS_FOLDER,-1L);
@ -8540,7 +8527,7 @@ static void Brw_PutFormToUploadFilesUsingDropzone (const char *FileNameToShow)
/***** Put button to refresh file browser after upload *****/ /***** Put button to refresh file browser after upload *****/
Frm_StartForm (Brw_ActRefreshAfterUploadFiles[Gbl.FileBrowser.Type]); Frm_StartForm (Brw_ActRefreshAfterUploadFiles[Gbl.FileBrowser.Type]);
Brw_PutExplicitParamsFileBrowser (Brw_ActRefreshAfterUploadFiles[Gbl.FileBrowser.Type], Brw_PutParamsFileBrowser (Brw_ActRefreshAfterUploadFiles[Gbl.FileBrowser.Type],
NULL,NULL, NULL,NULL,
Brw_IS_UNKNOWN, // Not used Brw_IS_UNKNOWN, // Not used
-1L); -1L);
@ -8576,7 +8563,7 @@ static void Brw_PutFormToUploadOneFileClassic (const char *FileNameToShow)
/***** Form to upload one files using the classic way *****/ /***** Form to upload one files using the classic way *****/
Frm_StartForm (Brw_ActUploadFileClassic[Gbl.FileBrowser.Type]); Frm_StartForm (Brw_ActUploadFileClassic[Gbl.FileBrowser.Type]);
Brw_PutExplicitParamsFileBrowser (Brw_ActUploadFileClassic[Gbl.FileBrowser.Type], Brw_PutParamsFileBrowser (Brw_ActUploadFileClassic[Gbl.FileBrowser.Type],
Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk, Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk,
Gbl.FileBrowser.FilFolLnkName, Gbl.FileBrowser.FilFolLnkName,
Brw_IS_FOLDER,-1L); Brw_IS_FOLDER,-1L);
@ -8603,7 +8590,7 @@ static void Brw_PutFormToPasteAFileOrFolder (const char *FileNameToShow)
/***** Start form *****/ /***** Start form *****/
Frm_StartForm (Brw_ActPaste[Gbl.FileBrowser.Type]); Frm_StartForm (Brw_ActPaste[Gbl.FileBrowser.Type]);
Brw_PutExplicitParamsFileBrowser (Brw_ActPaste[Gbl.FileBrowser.Type], Brw_PutParamsFileBrowser (Brw_ActPaste[Gbl.FileBrowser.Type],
Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk, Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk,
Gbl.FileBrowser.FilFolLnkName, Gbl.FileBrowser.FilFolLnkName,
Brw_IS_FOLDER,-1L); Brw_IS_FOLDER,-1L);
@ -8638,7 +8625,7 @@ static void Brw_PutFormToCreateALink (const char *FileNameToShow)
/***** Start form *****/ /***** Start form *****/
Frm_StartForm (Brw_ActCreateLink[Gbl.FileBrowser.Type]); Frm_StartForm (Brw_ActCreateLink[Gbl.FileBrowser.Type]);
Brw_PutExplicitParamsFileBrowser (Brw_ActCreateLink[Gbl.FileBrowser.Type], Brw_PutParamsFileBrowser (Brw_ActCreateLink[Gbl.FileBrowser.Type],
Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk, Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk,
Gbl.FileBrowser.FilFolLnkName, Gbl.FileBrowser.FilFolLnkName,
Brw_IS_FOLDER,-1L); Brw_IS_FOLDER,-1L);
@ -9633,7 +9620,7 @@ void Brw_ShowFileMetadata (void)
} }
Frm_StartForm (Brw_ActRecDatFile[Gbl.FileBrowser.Type]); Frm_StartForm (Brw_ActRecDatFile[Gbl.FileBrowser.Type]);
Brw_PutExplicitParamsFileBrowser (Brw_ActRecDatFile[Gbl.FileBrowser.Type], Brw_PutParamsFileBrowser (Brw_ActRecDatFile[Gbl.FileBrowser.Type],
FileMetadata.PathInTreeUntilFilFolLnk, FileMetadata.PathInTreeUntilFilFolLnk,
FileMetadata.FilFolLnkName, FileMetadata.FilFolLnkName,
FileMetadata.FileType,-1L); FileMetadata.FileType,-1L);
@ -10151,7 +10138,7 @@ static void Brw_WriteBigLinkToDownloadFile (const char *URL,
/* Form to see marks */ /* Form to see marks */
Frm_StartForm (Gbl.FileBrowser.Type == Brw_SHOW_MRK_CRS ? ActSeeMyMrkCrs : Frm_StartForm (Gbl.FileBrowser.Type == Brw_SHOW_MRK_CRS ? ActSeeMyMrkCrs :
ActSeeMyMrkGrp); ActSeeMyMrkGrp);
Brw_PutExplicitParamsFileBrowser (ActUnk, Brw_PutParamsFileBrowser (ActUnk,
FileMetadata->PathInTreeUntilFilFolLnk, FileMetadata->PathInTreeUntilFilFolLnk,
FileMetadata->FilFolLnkName, FileMetadata->FilFolLnkName,
FileMetadata->FileType,-1L); FileMetadata->FileType,-1L);
@ -10209,7 +10196,7 @@ static void Brw_WriteSmallLinkToDownloadFile (const char *URL,Brw_FileType_t Fil
/* Form to see marks */ /* Form to see marks */
Frm_StartForm (Gbl.FileBrowser.Type == Brw_SHOW_MRK_CRS ? ActSeeMyMrkCrs : Frm_StartForm (Gbl.FileBrowser.Type == Brw_SHOW_MRK_CRS ? ActSeeMyMrkCrs :
ActSeeMyMrkGrp); ActSeeMyMrkGrp);
Brw_PutExplicitParamsFileBrowser (ActUnk, Brw_PutParamsFileBrowser (ActUnk,
Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk, Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk,
Gbl.FileBrowser.FilFolLnkName, Gbl.FileBrowser.FilFolLnkName,
FileType,-1L); FileType,-1L);
@ -12226,7 +12213,7 @@ static void Brw_WriteRowDocData (unsigned long *NumDocsNotHidden,MYSQL_ROW row)
Frm_StartForm (Action); Frm_StartForm (Action);
/* Parameters to go to file / folder */ /* Parameters to go to file / folder */
Brw_PutExplicitParamsFileBrowser (ActUnk, Brw_PutParamsFileBrowser (ActUnk,
FileMetadata.FileType == Brw_IS_FOLDER ? FileMetadata.PathInTreeUntilFilFolLnk : FileMetadata.FileType == Brw_IS_FOLDER ? FileMetadata.PathInTreeUntilFilFolLnk :
NULL, NULL,
FileMetadata.FileType == Brw_IS_FOLDER ? FileMetadata.FilFolLnkName : FileMetadata.FileType == Brw_IS_FOLDER ? FileMetadata.FilFolLnkName :

2
swad_file_browser.h
View File

@ -247,7 +247,7 @@ void Brw_SetFullPathInTree (const char *PathInTreeUntilFileOrFolder,const char *
void Brw_CreateTmpPublicLinkToPrivateFile (const char *FullPathIncludingFile, void Brw_CreateTmpPublicLinkToPrivateFile (const char *FullPathIncludingFile,
const char *FileName); const char *FileName);
void Brw_PutExplicitParamsFileBrowser (Act_Action_t NextAction, void Brw_PutParamsFileBrowser (Act_Action_t NextAction,
const char *PathInTree,const char *FileFolderName, const char *PathInTree,const char *FileFolderName,
Brw_FileType_t FileType,long FilCod); Brw_FileType_t FileType,long FilCod);

4
swad_mark.c
View File

@ -145,7 +145,7 @@ void Mrk_GetAndWriteNumRowsHeaderAndFooter (Brw_FileType_t FileType,
Mrk_HeadOrFootStr[Brw_HEADER],Marks.Header, Mrk_HeadOrFootStr[Brw_HEADER],Marks.Header,
Gbl.RowEvenOdd, Gbl.RowEvenOdd,
Gbl.Form.Id); Gbl.Form.Id);
Brw_PutExplicitParamsFileBrowser (ActUnk, Brw_PutParamsFileBrowser (ActUnk,
PathInTree,FileName, PathInTree,FileName,
FileType,-1L); FileType,-1L);
Frm_EndForm (); Frm_EndForm ();
@ -172,7 +172,7 @@ void Mrk_GetAndWriteNumRowsHeaderAndFooter (Brw_FileType_t FileType,
Mrk_HeadOrFootStr[Brw_FOOTER],Marks.Footer, Mrk_HeadOrFootStr[Brw_FOOTER],Marks.Footer,
Gbl.RowEvenOdd, Gbl.RowEvenOdd,
Gbl.Form.Id); Gbl.Form.Id);
Brw_PutExplicitParamsFileBrowser (ActUnk, Brw_PutParamsFileBrowser (ActUnk,
PathInTree,FileName, PathInTree,FileName,
FileType,-1L); FileType,-1L);
Frm_EndForm (); Frm_EndForm ();

42
swad_text.c
View File

@ -31908,27 +31908,6 @@ const char *Txt_Remove_file =
"Remover arquivo"; "Remover arquivo";
#endif #endif
const char *Txt_Remove_FILE_OR_LINK_X = // Warning: it is very important to include %s in the following sentences
#if L==1 // ca
"Eliminar %s";
#elif L==2 // de
"Datei %s";
#elif L==3 // en
"Remove %s";
#elif L==4 // es
"Eliminar %s";
#elif L==5 // fr
"Supprimer %s";
#elif L==6 // gn
"Eliminar %s"; // Okoteve traducción
#elif L==7 // it
"Rimuovere %s";
#elif L==8 // pl
"Usu&nacute; %s";
#elif L==9 // pt
"Remover %s";
#endif
const char *Txt_Remove_files_older_than_PART_1_OF_2 = const char *Txt_Remove_files_older_than_PART_1_OF_2 =
#if L==1 // ca #if L==1 // ca
"Eliminar els arxius amb m&eacute;s de"; "Eliminar els arxius amb m&eacute;s de";
@ -31992,27 +31971,6 @@ const char *Txt_Remove_folder =
"Remover diret&oacute;rio"; "Remover diret&oacute;rio";
#endif #endif
const char *Txt_Remove_folder_X = // Warning: it is very important to include %s in the following sentences
#if L==1 // ca
"Eliminar carpeta %s";
#elif L==2 // de
"Verzeichnis entfernen %s";
#elif L==3 // en
"Remove folder %s";
#elif L==4 // es
"Eliminar carpeta %s";
#elif L==5 // fr
"Supprimer r&eacute;pertoire %s";
#elif L==6 // gn
"Eliminar carpeta %s"; // Okoteve traducción
#elif L==7 // it
"Rimuovere cartella %s";
#elif L==8 // pl
"Usu&nacute; folder %s";
#elif L==9 // pt
"Remover diret&oacute;rio %s";
#endif
const char *Txt_Remove_game = const char *Txt_Remove_game =
#if L==1 // ca #if L==1 // ca
"Eliminar joc"; "Eliminar joc";

2
swad_zip.c
View File

@ -366,7 +366,7 @@ void ZIP_PutButtonToDownloadZIPOfAFolder (const char *PathInTree,const char *Fil
extern const char *Txt_Create_ZIP_file; extern const char *Txt_Create_ZIP_file;
Frm_StartForm (ZIP_ActZIPFolder[Gbl.FileBrowser.Type]); Frm_StartForm (ZIP_ActZIPFolder[Gbl.FileBrowser.Type]);
Brw_PutExplicitParamsFileBrowser (ZIP_ActZIPFolder[Gbl.FileBrowser.Type], Brw_PutParamsFileBrowser (ZIP_ActZIPFolder[Gbl.FileBrowser.Type],
PathInTree,FileName, PathInTree,FileName,
Brw_IS_FOLDER,-1L); Brw_IS_FOLDER,-1L);
Frm_LinkFormSubmit (Txt_Create_ZIP_file,The_ClassFormInBox[Gbl.Prefs.Theme],NULL); Frm_LinkFormSubmit (Txt_Create_ZIP_file,The_ClassFormInBox[Gbl.Prefs.Theme],NULL);