Version 15.241.6

acanas · Jul 4, 2016 · d9bd8be · d9bd8be
1 parent d14c030
commit d9bd8be
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/swad_changelog.h b/swad_changelog.h
@@ -125,9 +125,6 @@
 // TODO: FIX BUG: Searching messages received gives unordered list
 
 // TODO: Put Ra�l Hinojosa (iSWAD developer) in a row of marks file of EC (B,C) and publish file
-// TODO: Add path to information about file in notifications
-
-// TODO: Add new WS functions to count the number of users to return in call to functions getUsers/findUsers?
 
 // TODO: In search of users and findUsers banned users should not appear in listing!!!!!
 // TODO: Send attached photos via SOAP?
@@ -136,13 +133,14 @@
 /****************************** Public constants *****************************/
 /*****************************************************************************/
 
-#define Log_PLATFORM_VERSION	"SWAD 15.241.5 (2016-07-04)"
+#define Log_PLATFORM_VERSION	"SWAD 15.241.6 (2016-07-04)"
 #define CSS_FILE		"swad15.229.css"
 #define JS_FILE			"swad15.238.1.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 15.241.6: Jul 04, 2015	Added path to information about file in notifications. (203630 lines)
         Version 15.241.5: Jul 04, 2015	Fix bug in form to compose message. (203628 lines)
         Version 15.241.4: Jul 04, 2015	Changes in form to compose message. (203624 lines)
         Version 15.241.3: Jul 04, 2015	Changes in layout of form to compose message.

diff --git a/swad_file_browser.c b/swad_file_browser.c
@@ -11370,12 +11370,13 @@ void Brw_RemoveUsrWorksInAllCrss (struct UsrData *UsrDat,Cns_QuietOrVerbose_t Qu
 /*****************************************************************************/
 // This function may be called inside a web service, so don't report error
 
-#define Brw_MAX_BYTES_FILE_CONTENT_STR (100+NAME_MAX + 100+(Usr_MAX_BYTES_NAME+1)*3 + 100+Fil_MAX_BYTES_FILE_SIZE_STRING)
+#define Brw_MAX_BYTES_FILE_CONTENT_STR (100+NAME_MAX + 100+PATH_MAX + 100+(Usr_MAX_BYTES_NAME+1)*3 + 100+Fil_MAX_BYTES_FILE_SIZE_STRING)
 
 void Brw_GetSummaryAndContentOfFile (char *SummaryStr,char **ContentStr,
                                      long FilCod,unsigned MaxChars,bool GetContent)
   {
    extern const char *Txt_Filename;
+   extern const char *Txt_Folder;
    extern const char *Txt_Uploaded_by;
    extern const char *Txt_ROLES_SINGUL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
    extern const char *Txt_File_size;
@@ -11426,9 +11427,11 @@ void Brw_GetSummaryAndContentOfFile (char *SummaryStr,char **ContentStr,
 
 	 /* Fill content string */
 	 sprintf (*ContentStr,"%s: %s<br />"	// File name
+	                      "%s: %s<br />"	// File path
 	                      "%s: %s<br />"	// Publisher
 	                      "%s: %s",		// File size
 	          Txt_Filename,FileMetadata.FilFolLnkName,
+	          Txt_Folder,FileMetadata.PathInTreeUntilFilFolLnk,
 	          Txt_Uploaded_by,FileHasPublisher ? PublisherUsrDat.FullName :
 	                                             Txt_ROLES_SINGUL_Abc[Rol_UNKNOWN][Usr_SEX_UNKNOWN],
 	          Txt_File_size,Found ? FileSizeStr :