mirror of https://github.com/acanas/swad-core.git
Version 16.147.11
This commit is contained in:
parent
3b54182e82
commit
a47496b456
|
@ -197,13 +197,14 @@
|
||||||
/****************************** Public constants *****************************/
|
/****************************** Public constants *****************************/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
#define Log_PLATFORM_VERSION "SWAD 16.147.10 (2017-03-06)"
|
#define Log_PLATFORM_VERSION "SWAD 16.147.11 (2017-03-06)"
|
||||||
#define CSS_FILE "swad16.147.css"
|
#define CSS_FILE "swad16.147.css"
|
||||||
#define JS_FILE "swad16.144.js"
|
#define JS_FILE "swad16.144.js"
|
||||||
|
|
||||||
// Number of lines (includes comments but not blank lines) has been got with the following command:
|
// 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
|
// nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*?.h sql/swad*.sql | tail -1
|
||||||
/*
|
/*
|
||||||
|
Version 16.147.11:Mar 06, 2017 Changes in names of zipped files. (216388 lines)
|
||||||
Version 16.147.10:Mar 06, 2017 Changes in layout of users' listing. (216394 lines)
|
Version 16.147.10:Mar 06, 2017 Changes in layout of users' listing. (216394 lines)
|
||||||
Version 16.147.9: Mar 06, 2017 Changes in layout of header. (216389 lines)
|
Version 16.147.9: Mar 06, 2017 Changes in layout of header. (216389 lines)
|
||||||
Version 16.147.8: Mar 05, 2017 Changes in layout of timetable. (216374 lines)
|
Version 16.147.8: Mar 05, 2017 Changes in layout of timetable. (216374 lines)
|
||||||
|
|
29
swad_zip.c
29
swad_zip.c
|
@ -281,11 +281,9 @@ static void ZIP_CreateTmpDirForCompression (void)
|
||||||
/**************** in the temporary directory of compression ******************/
|
/**************** in the temporary directory of compression ******************/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
#define ZIP_MAX_LENGTH_FULL_NAME_AND_ID (Usr_MAX_BYTES_FULL_NAME + 1 + ID_MAX_LENGTH_USR_ID + 10)
|
|
||||||
|
|
||||||
static void ZIP_CreateDirCompressionUsr (struct UsrData *UsrDat)
|
static void ZIP_CreateDirCompressionUsr (struct UsrData *UsrDat)
|
||||||
{
|
{
|
||||||
char FullNameAndUsrID[ZIP_MAX_LENGTH_FULL_NAME_AND_ID + 1];
|
char FullNameAndUsrID[NAME_MAX + 1];
|
||||||
char PathFolderUsrInsideCrs[PATH_MAX + 1];
|
char PathFolderUsrInsideCrs[PATH_MAX + 1];
|
||||||
char LinkTmpUsr[PATH_MAX + 1];
|
char LinkTmpUsr[PATH_MAX + 1];
|
||||||
char Link[PATH_MAX + 1];
|
char Link[PATH_MAX + 1];
|
||||||
|
@ -297,30 +295,29 @@ static void ZIP_CreateDirCompressionUsr (struct UsrData *UsrDat)
|
||||||
of the assignments and works *****/
|
of the assignments and works *****/
|
||||||
/* Create link name for this user */
|
/* Create link name for this user */
|
||||||
Str_Copy (FullNameAndUsrID,UsrDat->Surname1,
|
Str_Copy (FullNameAndUsrID,UsrDat->Surname1,
|
||||||
ZIP_MAX_LENGTH_FULL_NAME_AND_ID);
|
NAME_MAX);
|
||||||
if (UsrDat->Surname1[0] &&
|
if (UsrDat->Surname1[0] &&
|
||||||
UsrDat->Surname2[0])
|
UsrDat->Surname2[0])
|
||||||
Str_Concat (FullNameAndUsrID,"_", // Separation between surname 1 and surname 2
|
Str_Concat (FullNameAndUsrID,"_", // Separation between surname 1 and surname 2
|
||||||
ZIP_MAX_LENGTH_FULL_NAME_AND_ID);
|
NAME_MAX);
|
||||||
Str_Concat (FullNameAndUsrID,UsrDat->Surname2,
|
Str_Concat (FullNameAndUsrID,UsrDat->Surname2,
|
||||||
ZIP_MAX_LENGTH_FULL_NAME_AND_ID);
|
NAME_MAX);
|
||||||
if ((UsrDat->Surname1[0] ||
|
if ((UsrDat->Surname1[0] ||
|
||||||
UsrDat->Surname2[0]) &&
|
UsrDat->Surname2[0]) &&
|
||||||
UsrDat->FirstName[0])
|
UsrDat->FirstName[0])
|
||||||
Str_Concat (FullNameAndUsrID,"_", // Separation between surnames and first name
|
Str_Concat (FullNameAndUsrID,"_", // Separation between surnames and first name
|
||||||
ZIP_MAX_LENGTH_FULL_NAME_AND_ID);
|
NAME_MAX);
|
||||||
Str_Concat (FullNameAndUsrID,UsrDat->FirstName,
|
Str_Concat (FullNameAndUsrID,UsrDat->FirstName,
|
||||||
ZIP_MAX_LENGTH_FULL_NAME_AND_ID);
|
NAME_MAX);
|
||||||
if ((UsrDat->Surname1[0] ||
|
if ((UsrDat->Surname1[0] ||
|
||||||
UsrDat->Surname2[0] ||
|
UsrDat->Surname2[0] ||
|
||||||
UsrDat->FirstName[0]) &&
|
UsrDat->FirstName[0]) &&
|
||||||
UsrDat->IDs.Num)
|
UsrDat->IDs.Num)
|
||||||
Str_Concat (FullNameAndUsrID,"-", // Separation between name and ID
|
Str_Concat (FullNameAndUsrID,"-", // Separation between name and ID
|
||||||
ZIP_MAX_LENGTH_FULL_NAME_AND_ID);
|
NAME_MAX);
|
||||||
Str_LimitLengthHTMLStr (FullNameAndUsrID,50);
|
|
||||||
if (UsrDat->IDs.Num) // If this user has at least one ID
|
if (UsrDat->IDs.Num) // If this user has at least one ID
|
||||||
Str_Concat (FullNameAndUsrID,UsrDat->IDs.List[0].ID,
|
Str_Concat (FullNameAndUsrID,UsrDat->IDs.List[0].ID,
|
||||||
ZIP_MAX_LENGTH_FULL_NAME_AND_ID); // First user's ID
|
NAME_MAX); // First user's ID
|
||||||
Str_ConvertToValidFileName (FullNameAndUsrID);
|
Str_ConvertToValidFileName (FullNameAndUsrID);
|
||||||
|
|
||||||
/* Create path to folder and link */
|
/* Create path to folder and link */
|
||||||
|
@ -446,7 +443,7 @@ static void ZIP_CompressFolderIntoZIP (void)
|
||||||
|
|
||||||
/***** Create public zip file with the assignment and works *****/
|
/***** Create public zip file with the assignment and works *****/
|
||||||
sprintf (FileNameZIP,"%s.zip",strcmp (Gbl.FileBrowser.FilFolLnkName,".") ? Gbl.FileBrowser.FilFolLnkName :
|
sprintf (FileNameZIP,"%s.zip",strcmp (Gbl.FileBrowser.FilFolLnkName,".") ? Gbl.FileBrowser.FilFolLnkName :
|
||||||
Txt_ROOT_FOLDER_EXTERNAL_NAMES[Gbl.FileBrowser.Type]);
|
Txt_ROOT_FOLDER_EXTERNAL_NAMES[Gbl.FileBrowser.Type]);
|
||||||
sprintf (PathFileZIP,"%s/%s/%s/%s",
|
sprintf (PathFileZIP,"%s/%s/%s/%s",
|
||||||
Cfg_PATH_SWAD_PUBLIC,
|
Cfg_PATH_SWAD_PUBLIC,
|
||||||
Cfg_FOLDER_FILE_BROWSER_TMP,
|
Cfg_FOLDER_FILE_BROWSER_TMP,
|
||||||
|
@ -603,14 +600,8 @@ static void ZIP_ShowLinkToDownloadZIP (const char *FileName,const char *URL,
|
||||||
extern const char *Txt_Filename;
|
extern const char *Txt_Filename;
|
||||||
extern const char *Txt_File_size;
|
extern const char *Txt_File_size;
|
||||||
extern const char *Txt_FILE_uncompressed;
|
extern const char *Txt_FILE_uncompressed;
|
||||||
char FileNameShort[NAME_MAX + 1];
|
|
||||||
char FileSizeStr[Fil_MAX_BYTES_FILE_SIZE_STRING + 1];
|
char FileSizeStr[Fil_MAX_BYTES_FILE_SIZE_STRING + 1];
|
||||||
|
|
||||||
/***** Limit length of the name of the file *****/
|
|
||||||
Str_Copy (FileNameShort,FileName,
|
|
||||||
NAME_MAX);
|
|
||||||
Str_LimitLengthHTMLStr (FileNameShort,50);
|
|
||||||
|
|
||||||
/***** Start frame *****/
|
/***** Start frame *****/
|
||||||
Lay_StartRoundFrameTableShadow (NULL,NULL,NULL,NULL,2);
|
Lay_StartRoundFrameTableShadow (NULL,NULL,NULL,NULL,2);
|
||||||
|
|
||||||
|
@ -632,7 +623,7 @@ static void ZIP_ShowLinkToDownloadZIP (const char *FileName,const char *URL,
|
||||||
Gbl.Prefs.IconsURL,Cfg_ICON_FOLDER_FILEXT,
|
Gbl.Prefs.IconsURL,Cfg_ICON_FOLDER_FILEXT,
|
||||||
Txt_ZIP_file,
|
Txt_ZIP_file,
|
||||||
Txt_ZIP_file,
|
Txt_ZIP_file,
|
||||||
FileNameShort,
|
FileName,
|
||||||
Gbl.Prefs.IconsURL,
|
Gbl.Prefs.IconsURL,
|
||||||
Txt_Download,
|
Txt_Download,
|
||||||
Txt_Download);
|
Txt_Download);
|
||||||
|
|
Loading…
Reference in New Issue