Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 18.15

This commit is contained in:
Antonio Cañas Vargas 2018-11-10 13:32:38 +01:00
parent a071b531b0
commit 2289c994f1
3 changed files with 16 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -34,7 +34,8 @@ OBJS = swad_account.o swad_action.o swad_agenda.o swad_alert.o \
swad_database.o swad_date.o swad_degree.o swad_degree_type.o \
swad_department.o swad_duplicate.o \
swad_enrolment.o swad_exam.o \
swad_file.o swad_file_browser.o swad_follow.o swad_form.o swad_forum.o \
swad_file.o swad_file_browser.o swad_file_extension.o \
swad_follow.o swad_form.o swad_forum.o \
swad_game.o swad_global.o swad_group.o \
swad_help.o swad_hierarchy.o swad_holiday.o \
swad_icon.o swad_ID.o swad_image.o swad_indicator.o swad_info.o \

5
swad_changelog.h
View File

@ -355,11 +355,12 @@ En OpenSWAD:
ps2pdf source.ps destination.pdf
*/
#define Log_PLATFORM_VERSION "SWAD 18.14.1 (2018-11-09)"
#define Log_PLATFORM_VERSION "SWAD 18.15 (2018-11-10)"
#define CSS_FILE "swad18.4.css"
#define JS_FILE "swad17.17.1.js"
/*
Version 18.14.1: Nov 09, 2018 Dixed several bugs when compiling with -Os. (236721 lines)
Version 18.15: Nov 10, 2018 New module swad_file_extension for allowed file extensions. (? lines)
Version 18.14.1: Nov 09, 2018 Fixed several bugs when compiling with -Os. (236721 lines)
Version 18.14: Nov 09, 2018 New module swad_form for forms to go to actions.
Fixed bug in query to get assignments. (236705 lines)
Version 18.13.7: Nov 09, 2018 Fixed bug in file browser links. (236552 lines)

144
swad_file_browser.c
View File

@ -91,18 +91,7 @@ const char *Brw_FileTypeParamName[Brw_NUM_FILE_TYPES] =
"BrwFol", // Brw_IS_FOLDER
"BrwLnk", // Brw_IS_LINK
};
/*
const char *Brw_Licenses_DB[Brw_NUM_LICENSES] =
{
"all_rights_reserved", // All Rights Reserved
"cc_by", // CC Attribution License
"cc_by_sa", // CC Attribution-ShareAlike License
"cc_by_nd", // CC Attribution-NoDerivs License
"cc_by_nc", // CC Attribution-NonCommercial License
"cc_by_nc_sa", // CC Attribution-NonCommercial-ShareAlike License
"cc_by_nc_nd", // CC Attribution-NonCommercial-NoDerivs License
};
*/
// Browsers types for database "files" and "file_browser_size" tables
const Brw_FileBrowser_t Brw_FileBrowserForDB_files[Brw_NUM_TYPES_FILE_BROWSER] =
{
@ -1200,121 +1189,6 @@ const unsigned long long Brw_MAX_QUOTA_BRIEF[Rol_NUM_ROLES] = // MaxRole is used
#define Brw_MAX_FILES_BRIEF 5000
#define Brw_MAX_FOLDS_BRIEF 1000
/* Extensions allowed for uploaded files */
const char *Brw_FileExtensionsAllowed[] =
{
"3gp" , // Video Android mobile
"7z" ,
"asm" ,
"avi" ,
"bas" ,
"bat" ,
"bbl" ,
"bib" ,
"bin" ,
"bmp" ,
"bz2" ,
"c" ,
"cc" ,
"cdr" ,
"cpp" ,
"css" ,
"csv" ,
"dmg" ,
"doc" ,
"docx" ,
"dotm" ,
"dwd" ,
"eps" ,
"fdf" ,
"flv" ,
"gdb" , // GNU Debugger Script
"ggb" ,
"ggt" ,
"gif" ,
"gz" ,
"h" ,
"hex" ,
"htm" ,
"html" ,
"img" ,
"java" ,
"jpg" ,
"jpeg" ,
"latex",
"m" ,
"mdb" ,
"mht" ,
"mhtml",
"mid" ,
"mov" ,
"mp3" ,
"mp4" ,
"mpeg" ,
"mpg" ,
"mpp" ,
"mus" ,
"nb" ,
"odb" ,
"odc" ,
"odf" ,
"odg" ,
"odi" ,
"odm" ,
"odp" ,
"ods" ,
"odt" ,
"otg" ,
"otp" ,
"ots" ,
"ott" ,
"pas" ,
"pl" ,
"pdf" ,
"png" ,
"pps" ,
"ppsx" ,
"ppt" ,
"pptx" ,
"ps" ,
"pss" ,
"qt" ,
"r" ,
"ram" ,
"rar" ,
"raw" ,
"rdata",
"rm" ,
"rp" , // Axure, http://www.axure.com/
"rtf" ,
"s" ,
"sav" , // SPSS Data File
"sbs" ,
"sf3" ,
"sgp" ,
"spp" ,
"spo" ,
"sps" ,
"swf" ,
"sws" ,
"tar" ,
"tex" ,
"tgz" ,
"tif" ,
"txt" ,
"voc" ,
"vp" , // Justinmind, http://www.justinmind.com/
"wav" ,
"wma" ,
"wmv" ,
"wxm" ,
"wxmx" ,
"xls" ,
"xlsx" ,
"zip" ,
};
const unsigned Brw_NUM_FILE_EXT_ALLOWED = sizeof (Brw_FileExtensionsAllowed) / sizeof (Brw_FileExtensionsAllowed[0]);
/* MIME types allowed for uploades files */
const char *Brw_MIMETypesAllowed[] =
{
@ -6781,6 +6655,8 @@ static void Brw_PutIconFileWithLinkToViewMetadata (unsigned Size,
static void Brw_PutIconFile (unsigned Size,Brw_FileType_t FileType,const char *FileName)
{
extern const unsigned Ext_NUM_FILE_EXT_ALLOWED;
extern const char *Ext_FileExtensionsAllowed[];
extern const char *Txt_Link;
extern const char *Txt_X_file;
unsigned DocType;
@ -6797,14 +6673,14 @@ static void Brw_PutIconFile (unsigned Size,Brw_FileType_t FileType,const char *F
else // FileType == Brw_IS_FILE
{
for (DocType = 0, NotFound = true;
DocType < Brw_NUM_FILE_EXT_ALLOWED && NotFound;
DocType < Ext_NUM_FILE_EXT_ALLOWED && NotFound;
DocType++)
if (Str_FileIs (FileName,Brw_FileExtensionsAllowed[DocType]))
if (Str_FileIs (FileName,Ext_FileExtensionsAllowed[DocType]))
{
fprintf (Gbl.F.Out,"%s%ux%u.gif\" alt=\"",
Brw_FileExtensionsAllowed[DocType],
Ext_FileExtensionsAllowed[DocType],
Size,Size);
fprintf (Gbl.F.Out,Txt_X_file,Brw_FileExtensionsAllowed[DocType]);
fprintf (Gbl.F.Out,Txt_X_file,Ext_FileExtensionsAllowed[DocType]);
fprintf (Gbl.F.Out,"\"");
NotFound = false;
}
@ -9885,6 +9761,8 @@ void Brw_RecLinkFileBrowser (void)
static bool Brw_CheckIfUploadIsAllowed (const char *MIMEType)
{
extern const unsigned Ext_NUM_FILE_EXT_ALLOWED;
extern const char *Ext_FileExtensionsAllowed[];
extern const char *Txt_UPLOAD_FILE_X_MIME_type_Y_not_allowed_NO_HTML;
extern const char *Txt_UPLOAD_FILE_X_not_HTML_NO_HTML;
extern const char *Txt_UPLOAD_FILE_X_extension_not_allowed_NO_HTML;
@ -9923,9 +9801,9 @@ static bool Brw_CheckIfUploadIsAllowed (const char *MIMEType)
default:
/* Check the file extension */
for (Type = 0;
Type < Brw_NUM_FILE_EXT_ALLOWED;
Type < Ext_NUM_FILE_EXT_ALLOWED;
Type++)
if (Str_FileIs (Gbl.FileBrowser.NewFilFolLnkName,Brw_FileExtensionsAllowed[Type]))
if (Str_FileIs (Gbl.FileBrowser.NewFilFolLnkName,Ext_FileExtensionsAllowed[Type]))
{
ExtensionIsAllowed = true;
break;