From a47496b456a763220d71095bbdaccdbd2eb47a22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= <acanas@ugr.es>
Date: Mon, 6 Mar 2017 10:27:02 +0100
Subject: [PATCH] Version 16.147.11

---
 swad_changelog.h |  3 ++-
 swad_zip.c       | 29 ++++++++++-------------------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/swad_changelog.h b/swad_changelog.h
index 060c7da1..c4231370 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -197,13 +197,14 @@
 /****************************** 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 JS_FILE			"swad16.144.js"
 
 // 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
 /*
+        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.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)
diff --git a/swad_zip.c b/swad_zip.c
index 0eb5e0a8..306b9487 100644
--- a/swad_zip.c
+++ b/swad_zip.c
@@ -281,11 +281,9 @@ static void ZIP_CreateTmpDirForCompression (void)
 /**************** 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)
   {
-   char FullNameAndUsrID[ZIP_MAX_LENGTH_FULL_NAME_AND_ID + 1];
+   char FullNameAndUsrID[NAME_MAX + 1];
    char PathFolderUsrInsideCrs[PATH_MAX + 1];
    char LinkTmpUsr[PATH_MAX + 1];
    char Link[PATH_MAX + 1];
@@ -297,30 +295,29 @@ static void ZIP_CreateDirCompressionUsr (struct UsrData *UsrDat)
           of the assignments and works *****/
    /* Create link name for this user */
    Str_Copy (FullNameAndUsrID,UsrDat->Surname1,
-             ZIP_MAX_LENGTH_FULL_NAME_AND_ID);
+             NAME_MAX);
    if (UsrDat->Surname1[0] &&
        UsrDat->Surname2[0])
       Str_Concat (FullNameAndUsrID,"_",	// Separation between surname 1 and surname 2
-                  ZIP_MAX_LENGTH_FULL_NAME_AND_ID);
+                  NAME_MAX);
    Str_Concat (FullNameAndUsrID,UsrDat->Surname2,
-               ZIP_MAX_LENGTH_FULL_NAME_AND_ID);
+               NAME_MAX);
    if ((UsrDat->Surname1[0] ||
 	UsrDat->Surname2[0]) &&
        UsrDat->FirstName[0])
       Str_Concat (FullNameAndUsrID,"_",	// Separation between surnames and first name
-                  ZIP_MAX_LENGTH_FULL_NAME_AND_ID);
+                  NAME_MAX);
    Str_Concat (FullNameAndUsrID,UsrDat->FirstName,
-               ZIP_MAX_LENGTH_FULL_NAME_AND_ID);
+               NAME_MAX);
    if ((UsrDat->Surname1[0] ||
 	UsrDat->Surname2[0] ||
 	UsrDat->FirstName[0]) &&
        UsrDat->IDs.Num)
       Str_Concat (FullNameAndUsrID,"-",	// Separation between name and ID
-                  ZIP_MAX_LENGTH_FULL_NAME_AND_ID);
-   Str_LimitLengthHTMLStr (FullNameAndUsrID,50);
+                  NAME_MAX);
    if (UsrDat->IDs.Num)	// If this user has at least one 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);
 
    /* Create path to folder and link */
@@ -446,7 +443,7 @@ static void ZIP_CompressFolderIntoZIP (void)
 
       /***** Create public zip file with the assignment and works *****/
       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",
 	       Cfg_PATH_SWAD_PUBLIC,
 	       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_File_size;
    extern const char *Txt_FILE_uncompressed;
-   char FileNameShort[NAME_MAX + 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 *****/
    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,
             Txt_ZIP_file,
             Txt_ZIP_file,
-	    FileNameShort,
+	    FileName,
 	    Gbl.Prefs.IconsURL,
 	    Txt_Download,
 	    Txt_Download);