Marown/swad-core
Marown/swad-core
1
0
Fork 0
mirror of https://github.com/acanas/swad-core.git synced 2024-05-29 13:03:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version 16.62

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2016-11-14 21:38:43 +01:00
parent cd17b63532
commit c2a6fcc2b3
3 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -157,13 +157,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.61.8 (2016-11-14)"
#define Log_PLATFORM_VERSION "SWAD 16.62 (2016-11-14)"
#define CSS_FILE "swad16.60.1.css"
#define JS_FILE "swad16.46.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 16.62: Nov 14, 2016 Copy of all files inside root folder is now allowed (root folder not copied). (207165 lines)
Version 16.61.8: Nov 14, 2016 Code refactoring in clipboard. (207148 lines)
Version 16.61.7: Nov 14, 2016 Code refactoring in clipboard. (207155 lines)
Version 16.61.6: Nov 14, 2016 Code refactoring in clipboard. (207167 lines)

32
swad_file_browser.c
View File

@ -1538,7 +1538,9 @@ static void Brw_RemoveAffectedClipboards (Brw_FileBrowser_t FileBrowser,
long MyUsrCod,long WorksUsrCod);
static void Brw_PasteClipboard (void);
static unsigned Brw_NumLevelsInPath (const char *Path);
static bool Brw_PasteTreeIntoFolder (const char *PathOrg,const char *PathDstInTree,
static bool Brw_PasteTreeIntoFolder (unsigned Level,
const char *PathOrg,
const char *PathDstInTree,
struct Brw_NumObjects *Pasted,
long *FirstFilCod);
static void Brw_PutFormToCreateAFolder (const char *FileNameToShow);
@ -5191,7 +5193,8 @@ static bool Brw_WriteRowFileBrowser (unsigned Level,Brw_ExpandTree_t ExpandTree,
if (Brw_FileBrowserIsEditable[Gbl.FileBrowser.Type] &&
!Gbl.FileBrowser.ShowOnlyPublicFiles)
{
if (Gbl.FileBrowser.Clipboard.IsThisTree)
if (Gbl.FileBrowser.Clipboard.IsThisTree &&
Level != 0) // Never copy root folder
// If path in the clipboard is equal to complete path in tree...
// ...or is the start of complete path in tree...
if (Str_Path1BeginsByPath2 (Gbl.FileBrowser.Priv.FullPathInTree,Gbl.FileBrowser.Clipboard.Path))
@ -7695,7 +7698,9 @@ static void Brw_PasteClipboard (void)
/***** Paste tree (path in clipboard) into folder *****/
Brw_CalcSizeOfDir (Gbl.FileBrowser.Priv.PathRootFolder);
Brw_SetMaxQuota ();
if (Brw_PasteTreeIntoFolder (PathOrg,Gbl.FileBrowser.Priv.FullPathInTree,
if (Brw_PasteTreeIntoFolder (Gbl.FileBrowser.Clipboard.Level,
PathOrg,
Gbl.FileBrowser.Priv.FullPathInTree,
&Pasted,
&FirstFilCod))
{
@ -7770,11 +7775,13 @@ static unsigned Brw_NumLevelsInPath (const char *Path)
}
/*****************************************************************************/
/*********** Copy a source file o tree in the destination folder *************/
/********** Copy a source file or tree in the destination folder *************/
/*****************************************************************************/
// Return true if the copy has been made successfully, and false if not
static bool Brw_PasteTreeIntoFolder (const char *PathOrg,const char *PathDstInTree,
static bool Brw_PasteTreeIntoFolder (unsigned Level,
const char *PathOrg,
const char *PathDstInTree,
struct Brw_NumObjects *Pasted,
long *FirstFilCod)
{
@ -7826,14 +7833,20 @@ static bool Brw_PasteTreeIntoFolder (const char *PathOrg,const char *PathDstInTr
Brw_LimitLengthFileNameToShow (FileType,FileNameOrg,FileNameToShow);
/***** Construct the name of the destination file or folder *****/
sprintf (PathDstInTreeWithFile,"%s/%s",PathDstInTree,FileNameOrg);
if (Level == 0) // Origin of copy is the root folder,
// for example "sha"
// ==> do not copy root folder into destination
strcpy (PathDstInTreeWithFile,PathDstInTree);
else // Origin of copy is a file or folder inside the root folder
// for example "sha/folder1/file1"
sprintf (PathDstInTreeWithFile,"%s/%s",PathDstInTree,FileNameOrg);
/***** Construct the relative path of the destination file or folder *****/
sprintf (PathDstWithFile,"%s/%s",Gbl.FileBrowser.Priv.PathAboveRootFolder,PathDstInTreeWithFile);
/***** Update and check number of levels *****/
// The number of levels is counted starting on the root folder raíz, not included.
// Example: If PathDstInTreeWithFile is "maletin/1/2/3/4/FileNameOrg", then NumLevls=5
// Example: If PathDstInTreeWithFile is "root-folder/1/2/3/4/FileNameOrg", then NumLevls=5
if ((NumLevls = Brw_NumLevelsInPath (PathDstInTreeWithFile)) > Gbl.FileBrowser.Size.NumLevls)
Gbl.FileBrowser.Size.NumLevls = NumLevls;
if (Brw_CheckIfQuotaExceded ())
@ -7970,7 +7983,10 @@ static bool Brw_PasteTreeIntoFolder (const char *PathOrg,const char *PathDstInTr
strcmp (FileList[NumFile]->d_name,"..")) // Skip directories "." and ".."
{
sprintf (PathInFolderOrg,"%s/%s",PathOrg,FileList[NumFile]->d_name);
if (!Brw_PasteTreeIntoFolder (PathInFolderOrg,PathDstInTreeWithFile,
/* Recursive call to this function */
if (!Brw_PasteTreeIntoFolder (Level + 1,
PathInFolderOrg,
PathDstInTreeWithFile,
Pasted,
FirstFilCod))
CopyIsGoingSuccessful = false;

2
swad_file_browser.h
View File

@ -140,7 +140,7 @@ struct FileMetadata
#define Brw_INTERNAL_NAME_ROOT_FOLDER_DOCUMENTS "doc"
#define Brw_INTERNAL_NAME_ROOT_FOLDER_SHARED_FILES "sha"
#define Brw_INTERNAL_NAME_ROOT_FOLDER_DOWNLOAD "descarga" // TODO: It should be "doc"
#define Brw_INTERNAL_NAME_ROOT_FOLDER_DOWNLOAD "descarga" // TODO: It should be Brw_INTERNAL_NAME_ROOT_FOLDER_DOCUMENTS
#define Brw_INTERNAL_NAME_ROOT_FOLDER_TEACHERS "tch"
#define Brw_INTERNAL_NAME_ROOT_FOLDER_SHARED "comun" // TODO: It should be "sha"
#define Brw_INTERNAL_NAME_ROOT_FOLDER_ASSIGNMENTS "actividades" // TODO: It should be "asg"