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 15.93.3

This commit is contained in:
Antonio Cañas Vargas 2016-01-03 15:36:46 +01:00
parent 9f474e85e9
commit 6925503ad3
8 changed files with 141 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -118,13 +118,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.93.2 (2016-01-03)"
#define Log_PLATFORM_VERSION "SWAD 15.93.3 (2016-01-03)"
#define CSS_FILE "swad15.88.1.css"
#define JS_FILE "swad15.77.7.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.93.3: Jan 03, 2016 Code refactoring in file browser related with file metadata. (190345 lines)
Version 15.93.2: Jan 03, 2016 To show a file in social timeline, file code is passed as parameter instead of path. (190360 lines)
Version 15.93.1: Jan 03, 2016 Show text indicating document not available in social note. (190358 lines)
Version 15.93: Jan 03, 2016 Fixing bugs in file metadata of files in institution, centre and degree zones. (190335 lines)

186
swad_file_browser.c
View File

@ -1378,8 +1378,9 @@ static bool Brw_CheckIfAnyUpperLevelIsHidden (unsigned CurrentLevel);
static void Brw_PutIconFolder (unsigned Level,Brw_ExpandTree_t ExpandTree,
const char *PathInTree,const char *FileName,const char *FileNameToShow);
static void Brw_PutIconNewFileOrFolder (void);
static void Brw_PutIconFileWithLinkToViewMetadata (unsigned Size,Brw_FileType_t FileType,
const char *PathInTree,const char *FileName,const char *FileNameToShow);
static void Brw_PutIconFileWithLinkToViewMetadata (unsigned Size,
struct FileMetadata *FileMetadata,
const char *FileNameToShow);
static void Brw_PutIconFile (unsigned Size,Brw_FileType_t FileType,const char *FileName);
static void Brw_WriteFileName (unsigned Level,bool IsPublic,Brw_FileType_t FileType,
const char *PathInTree,const char *FileName,const char *FileNameToShow);
@ -1430,7 +1431,8 @@ static bool Brw_RcvFileInFileBrw (Brw_UploadType_t UploadType);
static bool Brw_CheckIfUploadIsAllowed (const char *FileType);
static bool Brw_CheckIfICanEditFileMetadata (long PublisherUsrCod);
static void Brw_WriteBigLinkToDownloadFile (const char *URL,Brw_FileType_t FileType,
static void Brw_WriteBigLinkToDownloadFile (const char *URL,
struct FileMetadata *FileMetadata,
const char *FileNameToShow);
static void Brw_WriteSmallLinkToDownloadFile (const char *URL,Brw_FileType_t FileType,
const char *FileNameToShow);
@ -2027,7 +2029,7 @@ void Brw_GetParAndInitFileBrowser (void)
/***** Get the path in the file browser and the name of the file or folder *****/
Brw_GetParamsPathInTreeAndFileName ();
Brw_SetFullPathInTree (Gbl.FileBrowser.Priv.PathInTreeExceptFileOrFolder,
Brw_SetFullPathInTree (Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk,
Gbl.FileBrowser.FilFolLnkName);
switch (Gbl.FileBrowser.Type)
@ -2272,8 +2274,8 @@ static void Brw_GetParamsPathInTreeAndFileName (void)
Brw_FileType_t FileType;
/***** Get the path inside the tree (this path does not include the name of the file or folder at the end) *****/
Par_GetParToText ("Path",Gbl.FileBrowser.Priv.PathInTreeExceptFileOrFolder,PATH_MAX);
if (strstr (Gbl.FileBrowser.Priv.PathInTreeExceptFileOrFolder,"..")) // ".." is not allowed in the path
Par_GetParToText ("Path",Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk,PATH_MAX);
if (strstr (Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk,"..")) // ".." is not allowed in the path
Lay_ShowErrorAndExit ("Wrong path.");
/***** Get the name of the file, folder or link *****/
@ -2300,7 +2302,7 @@ static void Brw_GetParamsPathInTreeAndFileName (void)
{
// Level == number-of-slashes-in-path-except-file-or-folder + 1
Gbl.FileBrowser.Level = 1;
for (Ptr = Gbl.FileBrowser.Priv.PathInTreeExceptFileOrFolder;
for (Ptr = Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk;
*Ptr;
Ptr++)
if (*Ptr == '/')
@ -2321,7 +2323,7 @@ static void Brw_GetParamsPathInTreeAndFileName (void)
else
{
// We are in this case: assignments/assignment-folder/rest-of-path
for (Ptr = Gbl.FileBrowser.Priv.PathInTreeExceptFileOrFolder;
for (Ptr = Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk;
*Ptr && *Ptr != '/';
Ptr++); // Go to first '/'
if (*Ptr == '/')
@ -4942,7 +4944,7 @@ static bool Brw_WriteRowFileBrowser (unsigned Level,
{
/* Icon with file type or link */
fprintf (Gbl.F.Out,"<td class=\"BM%u\">",Gbl.RowEvenOdd);
Brw_PutIconFileWithLinkToViewMetadata (16,FileType,PathInTree,FileName,FileNameToShow);
Brw_PutIconFileWithLinkToViewMetadata (16,&FileMetadata,FileNameToShow);
fprintf (Gbl.F.Out,"</td>");
}
@ -5564,8 +5566,9 @@ static void Brw_PutIconNewFileOrFolder (void)
/*****************************************************************************/
// FileType can be Brw_IS_FILE or Brw_IS_LINK
static void Brw_PutIconFileWithLinkToViewMetadata (unsigned Size,Brw_FileType_t FileType,
const char *PathInTree,const char *FileName,const char *FileNameToShow)
static void Brw_PutIconFileWithLinkToViewMetadata (unsigned Size,
struct FileMetadata *FileMetadata,
const char *FileNameToShow)
{
extern const char *Txt_View_data_of_FILE_OR_LINK_X;
@ -5587,7 +5590,7 @@ static void Brw_PutIconFileWithLinkToViewMetadata (unsigned Size,Brw_FileType_t
default:
break;
}
Brw_ParamListFiles (FileType,PathInTree,FileName);
Brw_PutHiddenParamFilCod (FileMetadata->FilCod);
/***** Name and link of the file or folder *****/
sprintf (Gbl.Title,Txt_View_data_of_FILE_OR_LINK_X,
@ -5597,7 +5600,7 @@ static void Brw_PutIconFileWithLinkToViewMetadata (unsigned Size,Brw_FileType_t
Act_LinkFormSubmit (Gbl.Title,Gbl.FileBrowser.TxtStyle);
/***** Icon depending on the file extension *****/
Brw_PutIconFile (Size,FileType,FileName);
Brw_PutIconFile (Size,FileMetadata->FileType,FileMetadata->FilFolLnkName);
/* End of the link and of the form */
fprintf (Gbl.F.Out,"</a>");
@ -6009,7 +6012,7 @@ void Brw_AskRemFileFromTree (void)
default:
break;
}
Brw_ParamListFiles (Gbl.FileBrowser.FileType,Gbl.FileBrowser.Priv.PathInTreeExceptFileOrFolder,Gbl.FileBrowser.FilFolLnkName);
Brw_ParamListFiles (Gbl.FileBrowser.FileType,Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk,Gbl.FileBrowser.FilFolLnkName);
/* Show question */
Brw_GetFileNameToShow (Gbl.FileBrowser.FileType,Gbl.FileBrowser.Level,Gbl.FileBrowser.FileType,
@ -6161,7 +6164,7 @@ static void Brw_AskConfirmRemoveFolderNotEmpty (void)
default:
break;
}
Brw_ParamListFiles (Brw_IS_FOLDER,Gbl.FileBrowser.Priv.PathInTreeExceptFileOrFolder,Gbl.FileBrowser.FilFolLnkName);
Brw_ParamListFiles (Brw_IS_FOLDER,Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk,Gbl.FileBrowser.FilFolLnkName);
sprintf (Gbl.Message,Txt_Do_you_really_want_to_remove_the_folder_X,
Gbl.FileBrowser.FilFolLnkName);
Lay_ShowAlert (Lay_WARNING,Gbl.Message);
@ -7787,7 +7790,7 @@ static void Brw_PutFormToCreateAFolder (const char *FileNameToShow)
default:
break;
}
Brw_ParamListFiles (Brw_IS_FOLDER,Gbl.FileBrowser.Priv.PathInTreeExceptFileOrFolder,Gbl.FileBrowser.FilFolLnkName);
Brw_ParamListFiles (Brw_IS_FOLDER,Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk,Gbl.FileBrowser.FilFolLnkName);
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Create_folder);
@ -7861,7 +7864,7 @@ static void Brw_PutFormToUploadFilesUsingDropzone (const char *FileNameToShow)
default:
break;
}
Brw_ParamListFiles (Brw_IS_FOLDER,Gbl.FileBrowser.Priv.PathInTreeExceptFileOrFolder,Gbl.FileBrowser.FilFolLnkName);
Brw_ParamListFiles (Brw_IS_FOLDER,Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk,Gbl.FileBrowser.FilFolLnkName);
fprintf (Gbl.F.Out,"<div class=\"dz-message\">"
"<span class=\"DAT_LIGHT\">%s</span>"
@ -7935,7 +7938,7 @@ static void Brw_PutFormToUploadOneFileClassic (const char *FileNameToShow)
default:
break;
}
Brw_ParamListFiles (Brw_IS_FOLDER,Gbl.FileBrowser.Priv.PathInTreeExceptFileOrFolder,Gbl.FileBrowser.FilFolLnkName);
Brw_ParamListFiles (Brw_IS_FOLDER,Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk,Gbl.FileBrowser.FilFolLnkName);
fprintf (Gbl.F.Out,"<input type=\"file\" name=\"%s\""
" size=\"50\" maxlength=\"100\" value=\"\" />",
Fil_NAME_OF_PARAM_FILENAME_ORG);
@ -7975,7 +7978,7 @@ static void Brw_PutFormToPasteAFileOrFolder (const char *FileNameToShow)
default:
break;
}
Brw_ParamListFiles (Brw_IS_FOLDER,Gbl.FileBrowser.Priv.PathInTreeExceptFileOrFolder,Gbl.FileBrowser.FilFolLnkName);
Brw_ParamListFiles (Brw_IS_FOLDER,Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk,Gbl.FileBrowser.FilFolLnkName);
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Paste);
@ -8022,7 +8025,7 @@ static void Brw_PutFormToCreateALink (const char *FileNameToShow)
default:
break;
}
Brw_ParamListFiles (Brw_IS_FOLDER,Gbl.FileBrowser.Priv.PathInTreeExceptFileOrFolder,Gbl.FileBrowser.FilFolLnkName);
Brw_ParamListFiles (Brw_IS_FOLDER,Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk,Gbl.FileBrowser.FilFolLnkName);
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Create_link);
@ -8183,15 +8186,15 @@ void Brw_RenFolderFileBrowser (void)
if (strcmp (Gbl.FileBrowser.FilFolLnkName,Gbl.FileBrowser.NewFilFolLnkName)) // The name has changed
{
/* Gbl.FileBrowser.FilFolLnkName holds the new name of the folder */
sprintf (OldPathInTree,"%s/%s",Gbl.FileBrowser.Priv.PathInTreeExceptFileOrFolder,Gbl.FileBrowser.FilFolLnkName);
sprintf (OldPathInTree,"%s/%s",Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk,Gbl.FileBrowser.FilFolLnkName);
sprintf (OldPath,"%s/%s",Gbl.FileBrowser.Priv.PathAboveRootFolder,OldPathInTree);
/* Gbl.FileBrowser.NewFilFolLnkName holds the new name of the folder */
if (strlen (Gbl.FileBrowser.Priv.PathAboveRootFolder)+1+
strlen (Gbl.FileBrowser.Priv.PathInTreeExceptFileOrFolder)+1+
strlen (Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk)+1+
strlen (Gbl.FileBrowser.NewFilFolLnkName) > PATH_MAX)
Lay_ShowErrorAndExit ("Path is too long.");
sprintf (NewPathInTree,"%s/%s",Gbl.FileBrowser.Priv.PathInTreeExceptFileOrFolder,Gbl.FileBrowser.NewFilFolLnkName);
sprintf (NewPathInTree,"%s/%s",Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk,Gbl.FileBrowser.NewFilFolLnkName);
sprintf (NewPath,"%s/%s",Gbl.FileBrowser.Priv.PathAboveRootFolder,NewPathInTree);
/* We should check here that a folder with the same name does not exist.
@ -8840,8 +8843,8 @@ bool Brw_CheckIfFileOrFolderIsHidden (struct FileMetadata *FileMetadata)
FileMetadata->FileBrowser,
FileMetadata->Cod,
FileMetadata->ZoneUsrCod,
FileMetadata->Path,
FileMetadata->Path);
FileMetadata->FullPathInTree,
FileMetadata->FullPathInTree);
return (DB_QueryCOUNT (Query,"can not check if a file or folder is hidden") != 0);
}
@ -8889,13 +8892,8 @@ void Brw_ShowFileMetadata (void)
Brw_GetParAndInitFileBrowser ();
/***** Get file metadata *****/
// Brw_GetFileMetadataByPath (&FileMetadata);
FileMetadata.FilCod = Brw_GetParamFilCod ();
Brw_GetFileMetadataByCod (&FileMetadata);
strcpy (Gbl.FileBrowser.Priv.FullPathInTree,FileMetadata.Path);
Str_SplitFullPathIntoPathAndFileName (Gbl.FileBrowser.Priv.FullPathInTree,
Gbl.FileBrowser.Priv.PathInTreeExceptFileOrFolder,
Gbl.FileBrowser.FilFolLnkName);
Found = Brw_GetFileTypeSizeAndDate (&FileMetadata);
if (Found)
@ -8903,7 +8901,8 @@ void Brw_ShowFileMetadata (void)
if (FileMetadata.FilCod <= 0) // No entry for this file in database table of files
/* Add entry to the table of files/folders */
FileMetadata.FilCod = Brw_AddPathToDB (-1L,FileMetadata.FileType,
Gbl.FileBrowser.Priv.FullPathInTree,false,Brw_LICENSE_DEFAULT);
FileMetadata.FullPathInTree,
false,Brw_LICENSE_DEFAULT);
/***** Check if I can view this file.
It could be marked as hidden or in a hidden folder *****/
@ -8957,8 +8956,8 @@ void Brw_ShowFileMetadata (void)
Gbl.FileBrowser.Type == Brw_SHOW_MARKS_GRP)
URL[0] = '\0';
else
Brw_GetLinkToDownloadFile (Gbl.FileBrowser.Priv.PathInTreeExceptFileOrFolder,
Gbl.FileBrowser.FilFolLnkName,
Brw_GetLinkToDownloadFile (FileMetadata.PathInTreeUntilFilFolLnk,
FileMetadata.FilFolLnkName,
URL);
/***** Can I edit the properties of the file? *****/
@ -8966,7 +8965,8 @@ void Brw_ShowFileMetadata (void)
/***** Name of the file/link to be shown *****/
Brw_LimitLengthFileNameToShow (FileMetadata.FileType,
Gbl.FileBrowser.FilFolLnkName,FileNameToShow);
FileMetadata.FilFolLnkName,
FileNameToShow);
/***** Start form to update the metadata of a file *****/
if (ICanEdit) // I can edit file properties
@ -9014,8 +9014,8 @@ void Brw_ShowFileMetadata (void)
break;
}
Brw_ParamListFiles (FileMetadata.FileType,
Gbl.FileBrowser.Priv.PathInTreeExceptFileOrFolder,
Gbl.FileBrowser.FilFolLnkName);
FileMetadata.PathInTreeUntilFilFolLnk,
FileMetadata.FilFolLnkName);
}
/***** Start frame *****/
@ -9025,8 +9025,7 @@ void Brw_ShowFileMetadata (void)
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\""
" class=\"FILENAME CENTER_MIDDLE\">");
Brw_WriteBigLinkToDownloadFile (URL,FileMetadata.FileType,
FileNameToShow);
Brw_WriteBigLinkToDownloadFile (URL,&FileMetadata,FileNameToShow);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
@ -9234,7 +9233,7 @@ void Brw_ShowFileMetadata (void)
}
/***** Add paths until file to table of expanded folders *****/
Brw_InsFoldersInPathAndUpdOtherFoldersInExpandedFolders (Gbl.FileBrowser.Priv.PathInTreeExceptFileOrFolder);
Brw_InsFoldersInPathAndUpdOtherFoldersInExpandedFolders (Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk);
}
else // !ICanView
{
@ -9295,7 +9294,8 @@ void Brw_DownloadFile (void)
if (FileMetadata.FilCod <= 0) // No entry for this file in database table of files
/* Add entry to the table of files/folders */
FileMetadata.FilCod = Brw_AddPathToDB (-1L,FileMetadata.FileType,
Gbl.FileBrowser.Priv.FullPathInTree,false,Brw_LICENSE_DEFAULT);
Gbl.FileBrowser.Priv.FullPathInTree,
false,Brw_LICENSE_DEFAULT);
/***** Check if I can view this file.
It could be marked as hidden or in a hidden folder *****/
@ -9337,7 +9337,7 @@ void Brw_DownloadFile (void)
Gbl.FileBrowser.Type == Brw_SHOW_MARKS_GRP)
URL[0] = '\0';
else
Brw_GetLinkToDownloadFile (Gbl.FileBrowser.Priv.PathInTreeExceptFileOrFolder,
Brw_GetLinkToDownloadFile (Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk,
Gbl.FileBrowser.FilFolLnkName,
URL);
@ -9372,7 +9372,7 @@ void Brw_DownloadFile (void)
}
/***** Add paths until file to table of expanded folders *****/
Brw_InsFoldersInPathAndUpdOtherFoldersInExpandedFolders (Gbl.FileBrowser.Priv.PathInTreeExceptFileOrFolder);
Brw_InsFoldersInPathAndUpdOtherFoldersInExpandedFolders (Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk);
/***** Download the file *****/
fprintf (stdout,"Location: %s\n\n",URL);
@ -9479,7 +9479,8 @@ static bool Brw_CheckIfICanEditFileMetadata (long PublisherUsrCod)
/*****************************************************************************/
// FileType can be Brw_IS_FILE or Brw_IS_LINK
static void Brw_WriteBigLinkToDownloadFile (const char *URL,Brw_FileType_t FileType,
static void Brw_WriteBigLinkToDownloadFile (const char *URL,
struct FileMetadata *FileMetadata,
const char *FileNameToShow)
{
extern const char *Txt_Check_marks_in_file_X;
@ -9502,14 +9503,14 @@ static void Brw_WriteBigLinkToDownloadFile (const char *URL,Brw_FileType_t FileT
default: // Not aplicable here
break;
}
Brw_ParamListFiles (FileType,
Gbl.FileBrowser.Priv.PathInTreeExceptFileOrFolder,
Gbl.FileBrowser.FilFolLnkName);
Brw_ParamListFiles (FileMetadata->FileType,
FileMetadata->PathInTreeUntilFilFolLnk,
FileMetadata->FilFolLnkName);
/* Link begin */
sprintf (Gbl.Title,Txt_Check_marks_in_file_X,FileNameToShow);
Act_LinkFormSubmit (Gbl.Title,"FILENAME");
Brw_PutIconFile (32,FileType,Gbl.FileBrowser.FilFolLnkName);
Brw_PutIconFile (32,FileMetadata->FileType,FileMetadata->FilFolLnkName);
/* Name of the file of marks, link end and form end */
fprintf (Gbl.F.Out,"&nbsp;%s&nbsp;"
@ -9527,9 +9528,9 @@ static void Brw_WriteBigLinkToDownloadFile (const char *URL,Brw_FileType_t FileT
fprintf (Gbl.F.Out,"<a href=\"%s\" class=\"FILENAME\""
" title=\"%s\" target=\"_blank\">",
URL,
(FileType == Brw_IS_LINK) ? URL : // If it's a link, show full URL in title
FileNameToShow);
Brw_PutIconFile (32,FileType,Gbl.FileBrowser.FilFolLnkName);
(FileMetadata->FileType == Brw_IS_LINK) ? URL : // If it's a link, show full URL in title
FileNameToShow);
Brw_PutIconFile (32,FileMetadata->FileType,FileMetadata->FilFolLnkName);
fprintf (Gbl.F.Out,"&nbsp;%s&nbsp;"
"<img src=\"%s/%s/download64x64.gif\""
" alt=\"%s\" title=\"%s\""
@ -9568,7 +9569,7 @@ static void Brw_WriteSmallLinkToDownloadFile (const char *URL,Brw_FileType_t Fil
break;
}
Brw_ParamListFiles (FileType,
Gbl.FileBrowser.Priv.PathInTreeExceptFileOrFolder,
Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk,
Gbl.FileBrowser.FilFolLnkName);
/* Link begin */
@ -9876,8 +9877,11 @@ void Brw_GetFileMetadataByPath (struct FileMetadata *FileMetadata)
FileMetadata->FileType = (Brw_FileType_t) UnsignedNum;
/* Get path (row[6]) */
strncpy (FileMetadata->Path,row[6],PATH_MAX);
FileMetadata->Path[PATH_MAX] = '\0';
strncpy (FileMetadata->FullPathInTree,row[6],PATH_MAX);
FileMetadata->FullPathInTree[PATH_MAX] = '\0';
Str_SplitFullPathIntoPathAndFileName (FileMetadata->FullPathInTree,
FileMetadata->PathInTreeUntilFilFolLnk,
FileMetadata->FilFolLnkName);
/* File is hidden? (row[7]) */
switch (Gbl.FileBrowser.Type)
@ -9927,16 +9931,18 @@ void Brw_GetFileMetadataByPath (struct FileMetadata *FileMetadata)
}
else
{
FileMetadata->FilCod = -1L;
FileMetadata->FileBrowser = Brw_UNKNOWN;
FileMetadata->Cod = -1L;
FileMetadata->ZoneUsrCod = -1L;
FileMetadata->PublisherUsrCod = -1L;
FileMetadata->FileType = Brw_IS_UNKNOWN;
FileMetadata->Path[0] = '\0';
FileMetadata->IsHidden = false;
FileMetadata->IsPublic = false;
FileMetadata->License = Brw_LICENSE_DEFAULT;
FileMetadata->FilCod = -1L;
FileMetadata->FileBrowser = Brw_UNKNOWN;
FileMetadata->Cod = -1L;
FileMetadata->ZoneUsrCod = -1L;
FileMetadata->PublisherUsrCod = -1L;
FileMetadata->FileType = Brw_IS_UNKNOWN;
FileMetadata->FullPathInTree[0] = '\0';
FileMetadata->PathInTreeUntilFilFolLnk[0] = '\0';
FileMetadata->FilFolLnkName[0] = '\0';
FileMetadata->IsHidden = false;
FileMetadata->IsPublic = false;
FileMetadata->License = Brw_LICENSE_DEFAULT;
}
/***** Free structure that stores the query result *****/
@ -10001,8 +10007,11 @@ void Brw_GetFileMetadataByCod (struct FileMetadata *FileMetadata)
FileMetadata->FileType = (Brw_FileType_t) UnsignedNum;
/* Get path (row[6]) */
strncpy (FileMetadata->Path,row[6],PATH_MAX);
FileMetadata->Path[PATH_MAX] = '\0';
strncpy (FileMetadata->FullPathInTree,row[6],PATH_MAX);
FileMetadata->FullPathInTree[PATH_MAX] = '\0';
Str_SplitFullPathIntoPathAndFileName (FileMetadata->FullPathInTree,
FileMetadata->PathInTreeUntilFilFolLnk,
FileMetadata->FilFolLnkName);
/* Is a hidden file? (row[7]) */
switch (Gbl.FileBrowser.Type)
@ -10052,16 +10061,18 @@ void Brw_GetFileMetadataByCod (struct FileMetadata *FileMetadata)
}
else
{
FileMetadata->FilCod = -1L;
FileMetadata->FileBrowser = Brw_UNKNOWN;
FileMetadata->Cod = -1L;
FileMetadata->ZoneUsrCod = -1L;
FileMetadata->PublisherUsrCod = -1L;
FileMetadata->FileType = Brw_IS_UNKNOWN;
FileMetadata->Path[0] = '\0';
FileMetadata->IsHidden = false;
FileMetadata->IsPublic = false;
FileMetadata->License = Brw_LICENSE_DEFAULT;
FileMetadata->FilCod = -1L;
FileMetadata->FileBrowser = Brw_UNKNOWN;
FileMetadata->Cod = -1L;
FileMetadata->ZoneUsrCod = -1L;
FileMetadata->PublisherUsrCod = -1L;
FileMetadata->FileType = Brw_IS_UNKNOWN;
FileMetadata->FullPathInTree[0] = '\0';
FileMetadata->PathInTreeUntilFilFolLnk[0] = '\0';
FileMetadata->FilFolLnkName[0] = '\0';
FileMetadata->IsHidden = false;
FileMetadata->IsPublic = false;
FileMetadata->License = Brw_LICENSE_DEFAULT;
}
/***** Free structure that stores the query result *****/
@ -10087,7 +10098,7 @@ bool Brw_GetFileTypeSizeAndDate (struct FileMetadata *FileMetadata)
struct stat FileStatus;
sprintf (Path,"%s/%s",Gbl.FileBrowser.Priv.PathAboveRootFolder,
Gbl.FileBrowser.Priv.FullPathInTree);
FileMetadata->FullPathInTree);
if (lstat (Path,&FileStatus))
{
// Error on lstat
@ -10101,8 +10112,8 @@ bool Brw_GetFileTypeSizeAndDate (struct FileMetadata *FileMetadata)
if (S_ISDIR (FileStatus.st_mode))
FileMetadata->FileType = Brw_IS_FOLDER;
else if (S_ISREG (FileStatus.st_mode))
FileMetadata->FileType = Str_FileIs (Gbl.FileBrowser.Priv.FullPathInTree,"url") ? Brw_IS_LINK :
Brw_IS_FILE;
FileMetadata->FileType = Str_FileIs (FileMetadata->FullPathInTree,"url") ? Brw_IS_LINK :
Brw_IS_FILE;
else
FileMetadata->FileType = Brw_IS_UNKNOWN;
FileMetadata->Size = FileStatus.st_size;
@ -10580,7 +10591,7 @@ void Brw_GetCrsGrpFromFileMetadata (Brw_FileBrowser_t FileBrowser,long Cod,
/*****************************************************************************/
long Brw_AddPathToDB (long PublisherUsrCod,Brw_FileType_t FileType,
const char *Path,bool IsPublic,Brw_License_t License)
const char *FullPathInTree,bool IsPublic,Brw_License_t License)
{
long Cod = Brw_GetCodForFiles ();
long ZoneUsrCod = Brw_GetZoneUsrCodForFiles ();
@ -10595,7 +10606,7 @@ long Brw_AddPathToDB (long PublisherUsrCod,Brw_FileType_t FileType,
Cod,ZoneUsrCod,
PublisherUsrCod,
(unsigned) FileType,
Path,
FullPathInTree,
IsPublic ? 'Y' :
'N',
(unsigned) License);
@ -11173,8 +11184,6 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row)
const char *CrsShortName;
const char *BgColor;
const char *Title;
char PathUntilFileName[PATH_MAX+1];
char FileName[NAME_MAX+1];
char FileNameToShow[NAME_MAX+1];
/*
row[ 0] = FilCod
@ -11325,10 +11334,9 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row)
BgColor,Title);
/***** Get the name of the file to show *****/
Str_SplitFullPathIntoPathAndFileName (FileMetadata.Path,
PathUntilFileName,
FileName);
Brw_LimitLengthFileNameToShow (FileMetadata.FileType,FileName,FileNameToShow);
Brw_LimitLengthFileNameToShow (FileMetadata.FileType,
FileMetadata.FilFolLnkName,
FileNameToShow);
/***** Write file name using path (row[1]) *****/
fprintf (Gbl.F.Out,"<td class=\"DAT_N LEFT_TOP %s\">",
@ -11344,7 +11352,9 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row)
Act_FormStart (Brw_ActReqDatFile[FileMetadata.FileBrowser]);
if (GrpCod > 0)
Grp_PutParamGrpCod (GrpCod);
Brw_PutParamsPathAndFile (FileMetadata.FileType,PathUntilFileName,FileName);
Brw_PutParamsPathAndFile (FileMetadata.FileType,
FileMetadata.PathInTreeUntilFilFolLnk,
FileMetadata.FilFolLnkName);
Act_LinkFormSubmit (FileNameToShow,"DAT_N");
@ -11358,7 +11368,7 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row)
Txt_Folder,Txt_Folder);
else
/* Icon with file type or link */
Brw_PutIconFile (16,FileMetadata.FileType,FileName);
Brw_PutIconFile (16,FileMetadata.FileType,FileMetadata.FilFolLnkName);
/* File name and end of form */
fprintf (Gbl.F.Out,"%s"

8
swad_file_browser.h
View File

@ -104,7 +104,10 @@ struct FileMetadata
long Cod; // Code of institution, centre, degree, course or group
long ZoneUsrCod;
long PublisherUsrCod;
char Path[PATH_MAX+1];
char FullPathInTree[PATH_MAX+1];
// FullPathInTree is splitted as PathInTreeUntilFilFolLnk/FilFolLnkName
char PathInTreeUntilFilFolLnk[PATH_MAX+1]; // Path in tree, without ending '/', until file, folder or link name
char FilFolLnkName[NAME_MAX+1]; // File, folder or link name
bool IsHidden;
bool IsPublic;
Brw_License_t License;
@ -201,7 +204,8 @@ void Brw_GetCrsGrpFromFileMetadata (Brw_FileBrowser_t FileBrowser,long Cod,
long *GrpCod);
long Brw_AddPathToDB (long PublisherUsrCod,Brw_FileType_t FileType,
const char *Path,bool IsPublic,Brw_License_t License);
const char *FullPathInTree,
bool IsPublic,Brw_License_t License);
void Brw_RemoveExpiredExpandedFolders (void);

2
swad_global.h
View File

@ -504,7 +504,7 @@ struct Globals
{
char PathAboveRootFolder[PATH_MAX+1];
char PathRootFolder[PATH_MAX+1];
char PathInTreeExceptFileOrFolder[PATH_MAX+1];
char PathInTreeUntilFilFolLnk[PATH_MAX+1];
char FullPathInTree[PATH_MAX+1];
} Priv;
char NewFilFolLnkName[NAME_MAX+1];

2
swad_mark.c
View File

@ -611,7 +611,7 @@ void Mrk_ShowMyMarks (void)
Brw_GetParAndInitFileBrowser ();
/***** Get the path of the file of marks *****/
Brw_SetFullPathInTree (Gbl.FileBrowser.Priv.PathInTreeExceptFileOrFolder,
Brw_SetFullPathInTree (Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk,
Gbl.FileBrowser.FilFolLnkName);
sprintf (PathPrivate,"%s/%s",Gbl.FileBrowser.Priv.PathAboveRootFolder,Gbl.FileBrowser.Priv.FullPathInTree);

74
swad_notification.c
View File

@ -647,8 +647,6 @@ static bool Ntf_StartFormGoToAction (Ntf_NotifyEvent_t NotifyEvent,
long CtrCod = -1L;
long DegCod = -1L;
long GrpCod = -1L;
char PathUntilFileName[PATH_MAX+1];
char FileName[NAME_MAX+1];
Act_Action_t Action = ActUnk; // Initialized to avoid warning
/***** Parameters depending on the type of event *****/
@ -657,57 +655,41 @@ static bool Ntf_StartFormGoToAction (Ntf_NotifyEvent_t NotifyEvent,
case Ntf_EVENT_DOCUMENT_FILE:
case Ntf_EVENT_SHARED_FILE:
case Ntf_EVENT_MARKS_FILE:
Action = ActUnk;
FileMetadata.FilCod = Cod;
PathUntilFileName[0] = '\0';
FileName[0] = '\0';
if (FileMetadata.FilCod > 0)
{
Brw_GetFileMetadataByCod (&FileMetadata);
if (FileMetadata.FilCod > 0)
{
Brw_GetCrsGrpFromFileMetadata (FileMetadata.FileBrowser,FileMetadata.Cod,
&InsCod,&CtrCod,&DegCod,&CrsCod,&GrpCod);
Str_SplitFullPathIntoPathAndFileName (FileMetadata.Path,
PathUntilFileName,
FileName);
}
}
switch (NotifyEvent)
{
case Ntf_EVENT_DOCUMENT_FILE:
Action = (FileMetadata.FilCod > 0) ? ((GrpCod > 0) ? ActReqDatSeeDocGrp :
((CrsCod > 0) ? ActReqDatSeeDocCrs :
((DegCod > 0) ? ActReqDatSeeDocDeg :
(CtrCod > 0) ? ActReqDatSeeDocCtr :
ActReqDatSeeDocIns))) :
ActUnk;
break;
case Ntf_EVENT_SHARED_FILE:
Action = (FileMetadata.FilCod > 0) ? ((GrpCod > 0) ? ActReqDatShaGrp :
((CrsCod > 0) ? ActReqDatShaCrs :
((DegCod > 0) ? ActReqDatShaDeg :
(CtrCod > 0) ? ActReqDatShaCtr :
ActReqDatShaIns))) :
ActUnk;
break;
case Ntf_EVENT_MARKS_FILE:
Action = (FileMetadata.FilCod > 0) ? ((GrpCod > 0) ? ActReqDatSeeMrkGrp :
ActReqDatSeeMrkCrs) :
ActUnk;
break;
default: // Not aplicable here
break;
}
if (Action != ActUnk)
if (FileMetadata.FilCod > 0)
{
Brw_GetCrsGrpFromFileMetadata (FileMetadata.FileBrowser,FileMetadata.Cod,
&InsCod,&CtrCod,&DegCod,&CrsCod,&GrpCod);
switch (NotifyEvent)
{
case Ntf_EVENT_DOCUMENT_FILE:
Action = (GrpCod > 0 ? ActReqDatSeeDocGrp :
(CrsCod > 0 ? ActReqDatSeeDocCrs :
(DegCod > 0 ? ActReqDatSeeDocDeg :
(CtrCod > 0 ? ActReqDatSeeDocCtr :
ActReqDatSeeDocIns))));
break;
case Ntf_EVENT_SHARED_FILE:
Action = (GrpCod > 0 ? ActReqDatShaGrp :
(CrsCod > 0 ? ActReqDatShaCrs :
(DegCod > 0 ? ActReqDatShaDeg :
(CtrCod > 0 ? ActReqDatShaCtr :
ActReqDatShaIns))));
break;
case Ntf_EVENT_MARKS_FILE:
Action = (GrpCod > 0 ? ActReqDatSeeMrkGrp :
ActReqDatSeeMrkCrs);
break;
default: // Not aplicable here
break;
}
Act_FormStart (Action);
if (GrpCod > 0)
Grp_PutParamGrpCod (GrpCod);
if (FileMetadata.FilCod > 0)
{
// Brw_PutHiddenParamFilCod (FileMetadata.FilCod);
Brw_PutParamsPathAndFile (FileMetadata.FileType,PathUntilFileName,FileName);
}
Brw_PutHiddenParamFilCod (FileMetadata.FilCod);
}
break;
case Ntf_EVENT_NOTICE:

10
swad_social.c
View File

@ -619,8 +619,6 @@ static void Soc_PutFormGoToAction (Soc_NoteType_t NoteType,long CrsCod,long Cod)
long CtrCod = -1L;
long DegCod = -1L;
long GrpCod = -1L;
char PathUntilFileName[PATH_MAX+1];
char FileName[NAME_MAX+1];
/***** Parameters depending on the type of note *****/
switch (NoteType)
@ -634,25 +632,17 @@ static void Soc_PutFormGoToAction (Soc_NoteType_t NoteType,long CrsCod,long Cod)
case Soc_NOTE_CRS_DOC_PUB_FILE:
case Soc_NOTE_CRS_SHA_PUB_FILE:
FileMetadata.FilCod = Cod;
PathUntilFileName[0] = '\0';
FileName[0] = '\0';
if (FileMetadata.FilCod > 0)
{
Brw_GetFileMetadataByCod (&FileMetadata);
if (FileMetadata.FilCod > 0) // Found
{
Brw_GetCrsGrpFromFileMetadata (FileMetadata.FileBrowser,FileMetadata.Cod,
&InsCod,&CtrCod,&DegCod,&CrsCod,&GrpCod);
Str_SplitFullPathIntoPathAndFileName (FileMetadata.Path,
PathUntilFileName,
FileName);
}
}
if (FileMetadata.FilCod > 0)
{
Act_FormStart (Soc_DefaultActions[NoteType]);
Brw_PutHiddenParamFilCod (FileMetadata.FilCod);
// Brw_PutParamsPathAndFile (FileMetadata.FileType,PathUntilFileName,FileName);
}
break;
case Soc_NOTE_NOTICE:

12
swad_web_service.c
View File

@ -4174,8 +4174,6 @@ int swad__getFile (struct soap *soap,
extern const char *Txt_LICENSES[Brw_NUM_LICENSES];
int ReturnCode;
struct FileMetadata FileMetadata;
char PathUntilFileName[PATH_MAX+1];
char FileName[NAME_MAX+1];
char URL[PATH_MAX+1];
char PhotoURL[PATH_MAX+1];
@ -4277,8 +4275,8 @@ int swad__getFile (struct soap *soap,
/***** Set paths *****/
Deg_InitCurrentCourse ();
Str_SplitFullPathIntoPathAndFileName (FileMetadata.Path,PathUntilFileName,FileName);
Brw_SetFullPathInTree (PathUntilFileName,FileName);
Brw_SetFullPathInTree (FileMetadata.PathInTreeUntilFilFolLnk,
FileMetadata.FilFolLnkName);
Brw_InitializeFileBrowser ();
/***** Get file size and date *****/
@ -4288,12 +4286,12 @@ int swad__getFile (struct soap *soap,
Brw_GetAndUpdateFileViews (&FileMetadata);
/***** Create and get link to download the file *****/
Brw_GetLinkToDownloadFile (PathUntilFileName,
FileName,
Brw_GetLinkToDownloadFile (FileMetadata.PathInTreeUntilFilFolLnk,
FileMetadata.FilFolLnkName,
URL);
/***** Copy data into output structure *****/
strncpy (getFileOut->fileName,FileName,NAME_MAX);
strncpy (getFileOut->fileName,FileMetadata.FilFolLnkName,NAME_MAX);
getFileOut->fileName[NAME_MAX] = '\0';
strncpy (getFileOut->URL,URL,PATH_MAX);