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

Version18.118.5

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2019-04-23 15:07:32 +02:00
parent ff45922d8c
commit 5c4b28b083
3 changed files with 42 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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.118.4 (2019-04-23)" #define Log_PLATFORM_VERSION "SWAD 18.118.5 (2019-04-23)"
#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.118.5: Apr 23, 2019 Code refactoring in file browser. (242497 lines)
Version 18.118.4: Apr 23, 2019 Changes in file browser. (242518 lines) Version 18.118.4: Apr 23, 2019 Changes in file browser. (242518 lines)
Version 18.118.3: Apr 22, 2019 Changed the behaviour of creating zip in file browser. (242545 lines) Version 18.118.3: Apr 22, 2019 Changed the behaviour of creating zip in file browser. (242545 lines)
Version 18.118.2: Apr 22, 2019 Removed unused code related to hidden_params table. (242545 lines) Version 18.118.2: Apr 22, 2019 Removed unused code related to hidden_params table. (242545 lines)

85
swad_file_browser.c
View File

@ -1332,14 +1332,13 @@ static void Brw_PutIconFolderWithPlus (const char *FileBrowserId,const char *Row
static void Brw_PutIconNewFileOrFolder (void); static void Brw_PutIconNewFileOrFolder (void);
static void Brw_PutIconFileWithLinkToViewMetadata (unsigned Size, static void Brw_PutIconFileWithLinkToViewMetadata (unsigned Size,
struct FileMetadata *FileMetadata, struct FileMetadata *FileMetadata);
const char *FileNameToShow);
static void Brw_PutIconFile (unsigned Size,Brw_FileType_t FileType,const char *FileName); static void Brw_PutIconFile (unsigned Size,Brw_FileType_t FileType,const char *FileName);
static void Brw_PutButtonToDownloadZIPOfAFolder (const char *PathInTree,const char *FileName); static void Brw_PutButtonToDownloadZIPOfAFolder (const char *PathInTree,const char *FileName);
static void Brw_WriteFileName (unsigned Level,bool IsPublic, static void Brw_WriteFileName (unsigned Level,bool IsPublic,
const char *PathInTree,const char *FileName,const char *FileNameToShow); const char *PathInTree,const char *FileName);
static void Brw_GetFileNameToShowDependingOnLevel (Brw_FileBrowser_t FileBrowser, static void Brw_GetFileNameToShowDependingOnLevel (Brw_FileBrowser_t FileBrowser,
unsigned Level, unsigned Level,
Brw_FileType_t FileType, Brw_FileType_t FileType,
@ -1351,9 +1350,7 @@ static void Brw_GetFileNameToShow (Brw_FileType_t FileType,
static void Brw_WriteDatesAssignment (void); static void Brw_WriteDatesAssignment (void);
static void Brw_WriteFileSizeAndDate (struct FileMetadata *FileMetadata); static void Brw_WriteFileSizeAndDate (struct FileMetadata *FileMetadata);
static void Brw_WriteFileOrFolderPublisher (unsigned Level,unsigned long UsrCod); static void Brw_WriteFileOrFolderPublisher (unsigned Level,unsigned long UsrCod);
static void Brw_PutParamsRemFile (void);
static void Brw_AskConfirmRemoveFolderNotEmpty (void); static void Brw_AskConfirmRemoveFolderNotEmpty (void);
static void Brw_PutParamsRemFolder (void);
static void Brw_WriteCurrentClipboard (void); static void Brw_WriteCurrentClipboard (void);
@ -5462,7 +5459,6 @@ static bool Brw_WriteRowFileBrowser (unsigned Level,const char *RowId,
bool LightStyle = false; bool LightStyle = false;
bool IsRecent = false; bool IsRecent = false;
struct FileMetadata FileMetadata; struct FileMetadata FileMetadata;
char FileNameToShow[NAME_MAX + 1];
char FileBrowserId[32]; char FileBrowserId[32];
bool SeeDocsZone = Gbl.FileBrowser.Type == Brw_SHOW_DOC_INS || bool SeeDocsZone = Gbl.FileBrowser.Type == Brw_SHOW_DOC_INS ||
Gbl.FileBrowser.Type == Brw_SHOW_DOC_CTR || Gbl.FileBrowser.Type == Brw_SHOW_DOC_CTR ||
@ -5565,13 +5561,6 @@ static bool Brw_WriteRowFileBrowser (unsigned Level,const char *RowId,
else // Not an assignment zone else // Not an assignment zone
Gbl.FileBrowser.Asg.AsgCod = -1L; Gbl.FileBrowser.Asg.AsgCod = -1L;
/***** Get the name of the file to show *****/
Brw_GetFileNameToShowDependingOnLevel (Gbl.FileBrowser.Type,
Level,
Gbl.FileBrowser.FileType,
FileName,
FileNameToShow);
/***** Start this row *****/ /***** Start this row *****/
if (asprintf (&Anchor,"fil_brw_%u_%s", if (asprintf (&Anchor,"fil_brw_%u_%s",
Gbl.FileBrowser.Id,RowId) < 0) Gbl.FileBrowser.Id,RowId) < 0)
@ -5648,7 +5637,7 @@ static bool Brw_WriteRowFileBrowser (unsigned Level,const char *RowId,
{ {
/* Icon with file type or link */ /* Icon with file type or link */
fprintf (Gbl.F.Out,"<td class=\"BM%u\">",Gbl.RowEvenOdd); fprintf (Gbl.F.Out,"<td class=\"BM%u\">",Gbl.RowEvenOdd);
Brw_PutIconFileWithLinkToViewMetadata (16,&FileMetadata,FileNameToShow); Brw_PutIconFileWithLinkToViewMetadata (16,&FileMetadata);
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
} }
@ -5659,7 +5648,7 @@ static bool Brw_WriteRowFileBrowser (unsigned Level,const char *RowId,
/* File or folder name */ /* File or folder name */
Brw_WriteFileName (Level,FileMetadata.IsPublic, Brw_WriteFileName (Level,FileMetadata.IsPublic,
PathInTree,FileName,FileNameToShow); PathInTree,FileName);
/* End column */ /* End column */
fprintf (Gbl.F.Out,"</tr>" fprintf (Gbl.F.Out,"</tr>"
@ -6214,10 +6203,9 @@ static void Brw_PutIconNewFileOrFolder (void)
// FileType can be Brw_IS_FILE or Brw_IS_LINK // FileType can be Brw_IS_FILE or Brw_IS_LINK
static void Brw_PutIconFileWithLinkToViewMetadata (unsigned Size, static void Brw_PutIconFileWithLinkToViewMetadata (unsigned Size,
struct FileMetadata *FileMetadata, struct FileMetadata *FileMetadata)
const char *FileNameToShow)
{ {
extern const char *Txt_View_data_of_FILE_OR_LINK_X; extern const char *Txt_View_data;
/***** Start form *****/ /***** Start form *****/
Frm_StartForm (Brw_ActReqDatFile[Gbl.FileBrowser.Type]); Frm_StartForm (Brw_ActReqDatFile[Gbl.FileBrowser.Type]);
@ -6226,10 +6214,7 @@ static void Brw_PutIconFileWithLinkToViewMetadata (unsigned Size,
FileMetadata->FilCod); FileMetadata->FilCod);
/***** Name and link of the file or folder *****/ /***** Name and link of the file or folder *****/
snprintf (Gbl.Title,sizeof (Gbl.Title), Frm_LinkFormSubmit (Txt_View_data,Gbl.FileBrowser.TxtStyle,NULL);
Txt_View_data_of_FILE_OR_LINK_X,
FileNameToShow);
Frm_LinkFormSubmit (Gbl.Title,Gbl.FileBrowser.TxtStyle,NULL);
/***** Icon depending on the file extension *****/ /***** Icon depending on the file extension *****/
Brw_PutIconFile (Size,FileMetadata->FileType,FileMetadata->FilFolLnkName); Brw_PutIconFile (Size,FileMetadata->FileType,FileMetadata->FilFolLnkName);
@ -6254,10 +6239,8 @@ static void Brw_PutIconFile (unsigned Size,Brw_FileType_t FileType,const char *F
/***** Icon depending on the file extension *****/ /***** Icon depending on the file extension *****/
if (FileType == Brw_IS_LINK) if (FileType == Brw_IS_LINK)
fprintf (Gbl.F.Out,"<img src=\"%s/link.svg\"" fprintf (Gbl.F.Out,"<img src=\"%s/link.svg\" alt=\"%s\"",
" alt=\"%s\" title=\"%s\"", Cfg_URL_ICON_PUBLIC,Txt_Link);
Cfg_URL_ICON_PUBLIC,
Txt_Link,Txt_Link);
else // FileType == Brw_IS_FILE else // FileType == Brw_IS_FILE
{ {
fprintf (Gbl.F.Out,"<img src=\"%s%ux%u/", fprintf (Gbl.F.Out,"<img src=\"%s%ux%u/",
@ -6302,11 +6285,19 @@ static void Brw_PutButtonToDownloadZIPOfAFolder (const char *PathInTree,const ch
/*****************************************************************************/ /*****************************************************************************/
static void Brw_WriteFileName (unsigned Level,bool IsPublic, static void Brw_WriteFileName (unsigned Level,bool IsPublic,
const char *PathInTree,const char *FileName,const char *FileNameToShow) const char *PathInTree,const char *FileName)
{ {
extern const char *Txt_Check_marks_in_the_file; extern const char *Txt_Check_marks_in_the_file;
extern const char *Txt_Download; extern const char *Txt_Download;
extern const char *Txt_Public_open_educational_resource_OER_for_everyone; extern const char *Txt_Public_open_educational_resource_OER_for_everyone;
char FileNameToShow[NAME_MAX + 1];
/***** Get the name of the file to show *****/
Brw_GetFileNameToShowDependingOnLevel (Gbl.FileBrowser.Type,
Level,
Gbl.FileBrowser.FileType,
FileName,
FileNameToShow);
/***** Name and link of the folder, file or link *****/ /***** Name and link of the folder, file or link *****/
if (Gbl.FileBrowser.FileType == Brw_IS_FOLDER) if (Gbl.FileBrowser.FileType == Brw_IS_FOLDER)
@ -6604,8 +6595,10 @@ void Brw_AskRemFileFromTree (void)
Gbl.FileBrowser.FileType, Gbl.FileBrowser.FileType,
Gbl.FileBrowser.FilFolLnkName, Gbl.FileBrowser.FilFolLnkName,
FileNameToShow); FileNameToShow);
Brw_PathInTree = Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk;
Brw_FileName = Gbl.FileBrowser.FilFolLnkName;
Ale_ShowAlertAndButton (Brw_ActRemoveFile[Gbl.FileBrowser.Type],NULL,NULL, Ale_ShowAlertAndButton (Brw_ActRemoveFile[Gbl.FileBrowser.Type],NULL,NULL,
Brw_PutParamsRemFile, Brw_PutImplicitParamsFileBrowser,
Btn_REMOVE_BUTTON, Btn_REMOVE_BUTTON,
Gbl.FileBrowser.FileType == Brw_IS_FILE ? Txt_Remove_file : Gbl.FileBrowser.FileType == Brw_IS_FILE ? Txt_Remove_file :
Txt_Remove_link, Txt_Remove_link,
@ -6619,17 +6612,6 @@ void Brw_AskRemFileFromTree (void)
Brw_ShowAgainFileBrowserOrWorks (); Brw_ShowAgainFileBrowserOrWorks ();
} }
/*****************************************************************************/
/*********************** Put params to remove a file/link ********************/
/*****************************************************************************/
static void Brw_PutParamsRemFile (void)
{
Brw_PutParamsFileBrowser (Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk,
Gbl.FileBrowser.FilFolLnkName,
Gbl.FileBrowser.FileType,-1L);
}
/*****************************************************************************/ /*****************************************************************************/
/************************ Remove a file of a file browser ********************/ /************************ Remove a file of a file browser ********************/
/*****************************************************************************/ /*****************************************************************************/
@ -6752,24 +6734,15 @@ static void Brw_AskConfirmRemoveFolderNotEmpty (void)
extern const char *Txt_Remove_folder; extern const char *Txt_Remove_folder;
/***** Show question and button to remove not empty folder *****/ /***** Show question and button to remove not empty folder *****/
Brw_PathInTree = Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk;
Brw_FileName = Gbl.FileBrowser.FilFolLnkName;
Ale_ShowAlertAndButton (Brw_ActRemoveFolderNotEmpty[Gbl.FileBrowser.Type],NULL,NULL, Ale_ShowAlertAndButton (Brw_ActRemoveFolderNotEmpty[Gbl.FileBrowser.Type],NULL,NULL,
Brw_PutParamsRemFolder, Brw_PutImplicitParamsFileBrowser,
Btn_REMOVE_BUTTON,Txt_Remove_folder, Btn_REMOVE_BUTTON,Txt_Remove_folder,
Ale_QUESTION,Txt_Do_you_really_want_to_remove_the_folder_X, Ale_QUESTION,Txt_Do_you_really_want_to_remove_the_folder_X,
Gbl.FileBrowser.FilFolLnkName); Gbl.FileBrowser.FilFolLnkName);
} }
/*****************************************************************************/
/************************ Put params to remove a folder **********************/
/*****************************************************************************/
static void Brw_PutParamsRemFolder (void)
{
Brw_PutParamsFileBrowser (Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk,
Gbl.FileBrowser.FilFolLnkName,
Gbl.FileBrowser.FileType,-1L);
}
/*****************************************************************************/ /*****************************************************************************/
/********* Complete removing of a not empty folder in a file browser *********/ /********* Complete removing of a not empty folder in a file browser *********/
/*****************************************************************************/ /*****************************************************************************/
@ -10104,6 +10077,7 @@ static void Brw_WriteBigLinkToDownloadFile (const char *URL,
{ {
extern const char *Txt_Check_marks_in_the_file; extern const char *Txt_Check_marks_in_the_file;
extern const char *Txt_Download; extern const char *Txt_Download;
const char *Title;
/***** On the screen a link will be shown to download the file *****/ /***** On the screen a link will be shown to download the file *****/
if (Gbl.FileBrowser.Type == Brw_SHOW_MRK_CRS || if (Gbl.FileBrowser.Type == Brw_SHOW_MRK_CRS ||
@ -10132,12 +10106,13 @@ static void Brw_WriteBigLinkToDownloadFile (const char *URL,
} }
else else
{ {
Title = (FileMetadata->FileType == Brw_IS_LINK) ? URL : // If it's a link, show full URL in title
Txt_Download;
/* Put anchor and filename */ /* Put anchor and filename */
fprintf (Gbl.F.Out,"<a href=\"%s\" class=\"FILENAME_TXT\"" fprintf (Gbl.F.Out,"<a href=\"%s\" class=\"FILENAME_TXT\""
" title=\"%s\" target=\"_blank\">", " title=\"%s\" target=\"_blank\">",
URL, URL,Title);
(FileMetadata->FileType == Brw_IS_LINK) ? URL : // If it's a link, show full URL in title
FileNameToShow);
Brw_PutIconFile (32,FileMetadata->FileType,FileMetadata->FilFolLnkName); Brw_PutIconFile (32,FileMetadata->FileType,FileMetadata->FilFolLnkName);
fprintf (Gbl.F.Out,"&nbsp;%s&nbsp;" fprintf (Gbl.F.Out,"&nbsp;%s&nbsp;"
"<img src=\"%s/download.svg\"" "<img src=\"%s/download.svg\""
@ -10146,7 +10121,7 @@ static void Brw_WriteBigLinkToDownloadFile (const char *URL,
"</a>", "</a>",
FileNameToShow, FileNameToShow,
Cfg_URL_ICON_PUBLIC, Cfg_URL_ICON_PUBLIC,
Txt_Download,Txt_Download); Title,Title);
} }
} }

20
swad_text.c
View File

@ -52143,25 +52143,25 @@ const char *Txt_View_attendance =
"Ver presen&ccedil;a"; "Ver presen&ccedil;a";
#endif #endif
const char *Txt_View_data_of_FILE_OR_LINK_X = // Warning: it is very important to include %s in the following sentences const char *Txt_View_data =
#if L==1 // ca #if L==1 // ca
"Veure dades de %s"; "Veure dades";
#elif L==2 // de #elif L==2 // de
"Siehe Daten von %s"; "Siehe Daten";
#elif L==3 // en #elif L==3 // en
"View data of %s"; "View data";
#elif L==4 // es #elif L==4 // es
"Ver datos de %s"; "Ver datos";
#elif L==5 // fr #elif L==5 // fr
"Voir les donn&eacute;es de %s"; "Voir les donn&eacute;es";
#elif L==6 // gn #elif L==6 // gn
"Ver datos de %s"; // Okoteve traducción "Ver datos"; // Okoteve traducción
#elif L==7 // it #elif L==7 // it
"Visualizza i dati de %s"; "Visualizza i dati";
#elif L==8 // pl #elif L==8 // pl
"Zobacz dane z %s"; "Zobacz dane";
#elif L==9 // pt #elif L==9 // pt
"Ver os dados de %s"; "Ver os dados";
#endif #endif
const char *Txt_View_email_addresses = const char *Txt_View_email_addresses =