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.211

This commit is contained in:
Antonio Cañas Vargas 2016-05-07 14:33:54 +02:00
parent 948f6ca40c
commit c4f954f51c
5 changed files with 61 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
swad_action.c
View File

@ -2812,7 +2812,7 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
/* ActChgDatBrf */{1048,-1,TabPrf,ActAdmBrf ,0x1FC,0x1FC,0x1FC,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Brw_ChgFileMetadata ,NULL},
/* ActDowBrf */{1123,-1,TabPrf,ActAdmBrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_DOWNLD_FILE,Brw_DownloadFile ,NULL ,NULL},
/* ActReqRemOldBrf */{1488,-1,TabPrf,ActAdmBrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Brw_AskRemoveOldFiles ,NULL},
/* ActRemOldBrf */{1489,-1,TabPrf,ActAdmBrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Brw_RemoveOldFiles ,NULL},
/* ActRemOldBrf */{1489,-1,TabPrf,ActAdmBrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Brw_RemoveOldFilesBriefcase ,NULL},
};
Act_Action_t Act_FromActCodToAction[1+Act_MAX_ACTION_COD] = // Do not reuse unique action codes!

4
swad_changelog.h
View File

@ -138,13 +138,15 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.210.4 (2016-05-05)"
#define Log_PLATFORM_VERSION "SWAD 15.211 (2016-05-07)"
#define CSS_FILE "swad15.210.css"
#define JS_FILE "swad15.197.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.211: May 07, 2016 Code refactoring related to removing old files in briefcase.
Old files in briefcase are removed automatically. (201396 lines)
Version 15.210.4: May 05, 2016 Link to change logo of degree is moved to top of window. (201385 lines)
Version 15.210.3: May 05, 2016 Link to change logo of centre is moved to top of window. (201407 lines)
Version 15.210.2: May 05, 2016 Link to change logo of institution is moved to top of window. (201399 lines)

95
swad_file_browser.c
View File

@ -1619,8 +1619,8 @@ static bool Brw_CheckIfICanModifySharedFileOrFolder (void);
static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row);
static void Brw_PutFormToAskRemOldFiles (void);
static void Brw_RemoveOldFilesInBrowser (time_t TimeRemoveFilesOlder);
static void Brw_ScanDirRemovingOlfFiles (unsigned Level,const char *Path,
static void Brw_RemoveOldFilesInBrowser (unsigned Months,struct Brw_NumObjects *Removed);
static void Brw_ScanDirRemovingOldFiles (unsigned Level,const char *Path,
const char *PathInTree,
time_t TimeRemoveFilesOlder,
struct Brw_NumObjects *Removed);
@ -3556,6 +3556,7 @@ static void Brw_ShowFileBrowser (void)
extern const char *Txt_Temporary_private_storage_area;
const char *Brw_TitleOfFileBrowser[Brw_NUM_TYPES_FILE_BROWSER];
void (*FunctionToDrawContextualIcons) (void);
struct Brw_NumObjects Removed;
bool IAmTeacherOrSysAdm = Gbl.Usrs.Me.LoggedRole == Rol_TEACHER ||
Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM;
@ -3640,6 +3641,11 @@ static void Brw_ShowFileBrowser (void)
break;
}
/***** If this is the (temporary) briefcase ==> remove old files *****/
if (Gbl.FileBrowser.Type == Brw_ADMI_BRIEF_USR)
Brw_RemoveOldFilesInBrowser (Brw_MAX_MONTHS_IN_BRIEFCASE,
&Removed); // Not used here
/***** Check if the maximum quota has been exceeded *****/
if (Brw_FileBrowserIsEditable[Gbl.FileBrowser.Type])
Brw_SetAndCheckQuota ();
@ -11801,10 +11807,6 @@ static void Brw_PutFormToAskRemOldFiles (void)
/************** Write a form fo confirm removing of old files ****************/
/*****************************************************************************/
#define Brw_MIN_MONTHS_TO_REMOVE_OLD_FILES 6 // 6 months
#define Brw_DEF_MONTHS_TO_REMOVE_OLD_FILES 24 // 2 years
#define Brw_MAX_MONTHS_TO_REMOVE_OLD_FILES (10*12) // 10 years
void Brw_AskRemoveOldFiles (void)
{
extern const char *The_ClassForm[The_NUM_THEMES];
@ -11829,8 +11831,8 @@ void Brw_AskRemoveOldFiles (void)
The_ClassForm[Gbl.Prefs.Theme],
Txt_Remove_files_older_than_PART_1_OF_2);
fprintf (Gbl.F.Out,"<select name=\"Months\">");
for (Months = Brw_MIN_MONTHS_TO_REMOVE_OLD_FILES;
Months <= Brw_MAX_MONTHS_TO_REMOVE_OLD_FILES;
for (Months = Brw_MIN_MONTHS_TO_REMOVE_OLD_FILES;
Months < Brw_MAX_MONTHS_IN_BRIEFCASE;
Months++)
{
fprintf (Gbl.F.Out,"<option");
@ -11856,31 +11858,43 @@ void Brw_AskRemoveOldFiles (void)
}
/*****************************************************************************/
/******************************* Remove old files ****************************/
/*********************** Remove old files in briefcase ***********************/
/*****************************************************************************/
void Brw_RemoveOldFiles (void)
void Brw_RemoveOldFilesBriefcase (void)
{
extern const char *Txt_Files_removed;
extern const char *Txt_Links_removed;
extern const char *Txt_Folders_removed;
char UnsignedStr[10+1];
unsigned Months;
time_t TimeRemoveFilesOlder;
struct Brw_NumObjects Removed;
/***** Get parameters related to file browser *****/
Brw_GetParAndInitFileBrowser ();
/***** Get parameter with number of months without access *****/
Par_GetParToText ("Months",UnsignedStr,10);
if (sscanf (UnsignedStr,"%u",&Months) != 1)
Lay_ShowErrorAndExit ("Number of months is missing.");
if (Months < Brw_MIN_MONTHS_TO_REMOVE_OLD_FILES ||
Months > Brw_MAX_MONTHS_TO_REMOVE_OLD_FILES)
Lay_ShowErrorAndExit ("Wrong number of months.");
TimeRemoveFilesOlder = Gbl.StartExecutionTimeUTC -
(time_t) Months * Dat_SECONDS_IN_ONE_MONTH;
/***** Remove old files *****/
if (Gbl.FileBrowser.Type == Brw_ADMI_BRIEF_USR)
Brw_RemoveOldFilesInBrowser (TimeRemoveFilesOlder);
{
/***** Get parameter with number of months without access *****/
Par_GetParToText ("Months",UnsignedStr,10);
if (sscanf (UnsignedStr,"%u",&Months) != 1)
Lay_ShowErrorAndExit ("Number of months is missing.");
if (Months < Brw_MIN_MONTHS_TO_REMOVE_OLD_FILES ||
Months >= Brw_MAX_MONTHS_IN_BRIEFCASE)
Lay_ShowErrorAndExit ("Wrong number of months.");
/***** Remove old files *****/
Brw_RemoveOldFilesInBrowser (Months,&Removed);
/***** Success message *****/
sprintf (Gbl.Message,"%s: %u<br />"
"%s: %u<br />"
"%s: %u",
Txt_Files_removed ,Removed.NumFiles,
Txt_Links_removed ,Removed.NumLinks,
Txt_Folders_removed,Removed.NumFolds);
Lay_ShowAlert (Lay_SUCCESS,Gbl.Message);
}
/***** Show again the file browser *****/
Brw_ShowAgainFileBrowserOrWorks ();
@ -11890,41 +11904,34 @@ void Brw_RemoveOldFiles (void)
/******************************* Remove old files ****************************/
/*****************************************************************************/
static void Brw_RemoveOldFilesInBrowser (time_t TimeRemoveFilesOlder)
static void Brw_RemoveOldFilesInBrowser (unsigned Months,struct Brw_NumObjects *Removed)
{
extern const char *Txt_Files_removed;
extern const char *Txt_Links_removed;
extern const char *Txt_Folders_removed;
struct Brw_NumObjects Removed;
time_t TimeRemoveFilesOlder;
/***** Compute time in seconds
(files older than this time will be removed) *****/
TimeRemoveFilesOlder = Gbl.StartExecutionTimeUTC -
(time_t) Months * Dat_SECONDS_IN_ONE_MONTH;
/***** Remove old files recursively *****/
Removed.NumFiles =
Removed.NumLinks =
Removed.NumFolds = 0;
Brw_ScanDirRemovingOlfFiles (1,Gbl.FileBrowser.Priv.PathRootFolder,
Removed->NumFiles =
Removed->NumLinks =
Removed->NumFolds = 0;
Brw_ScanDirRemovingOldFiles (1,Gbl.FileBrowser.Priv.PathRootFolder,
Brw_RootFolderInternalNames[Gbl.FileBrowser.Type],
TimeRemoveFilesOlder,&Removed);
TimeRemoveFilesOlder,Removed);
/***** Remove affected clipboards *****/
Brw_RemoveAffectedClipboards (Gbl.FileBrowser.Type,
Gbl.Usrs.Me.UsrDat.UsrCod,
Gbl.Usrs.Other.UsrDat.UsrCod);
/***** Success message *****/
sprintf (Gbl.Message,"%s: %u<br />"
"%s: %u<br />"
"%s: %u",
Txt_Files_removed ,Removed.NumFiles,
Txt_Links_removed ,Removed.NumLinks,
Txt_Folders_removed,Removed.NumFolds);
Lay_ShowAlert (Lay_SUCCESS,Gbl.Message);
}
/*****************************************************************************/
/************* Scan a directory recursively removing old files ***************/
/*****************************************************************************/
static void Brw_ScanDirRemovingOlfFiles (unsigned Level,const char *Path,
static void Brw_ScanDirRemovingOldFiles (unsigned Level,const char *Path,
const char *PathInTree,
time_t TimeRemoveFilesOlder,
struct Brw_NumObjects *Removed)
@ -11961,7 +11968,7 @@ static void Brw_ScanDirRemovingOlfFiles (unsigned Level,const char *Path,
lstat (PathFileRel,&FileStatus);
if (S_ISDIR (FileStatus.st_mode)) // It's a folder
/* Scan subtree starting at this this directory recursively */
Brw_ScanDirRemovingOlfFiles (Level + 1,PathFileRel,
Brw_ScanDirRemovingOldFiles (Level + 1,PathFileRel,
PathFileInExplTree,
TimeRemoveFilesOlder,Removed);
else if (S_ISREG (FileStatus.st_mode) && // It's a regular file

6
swad_file_browser.h
View File

@ -141,6 +141,10 @@ struct FileMetadata
#define Brw_INTERNAL_NAME_ROOT_FOLDER_MARKS "calificaciones" // TODO: It should be "mrk"
#define Brw_INTERNAL_NAME_ROOT_FOLDER_BRIEF "maletin" // TODO: It should be "brf"
#define Brw_MIN_MONTHS_TO_REMOVE_OLD_FILES 6 // 6 months
#define Brw_DEF_MONTHS_TO_REMOVE_OLD_FILES 12 // 1 year
#define Brw_MAX_MONTHS_IN_BRIEFCASE (10*12) // 10 years
/*****************************************************************************/
/***************************** Public prototypes *****************************/
/*****************************************************************************/
@ -237,6 +241,6 @@ unsigned Brw_ListDocsFound (const char *Query,
const char *TitleSingular,const char *TitlePlural);
void Brw_AskRemoveOldFiles (void);
void Brw_RemoveOldFiles (void);
void Brw_RemoveOldFilesBriefcase (void);
#endif

2
swad_zip.c
View File

@ -51,7 +51,7 @@
/*****************************************************************************/
#define ZIP_MiB (1024ULL*1024ULL)
#define ZIP_MAX_SIZE_UNCOMPRESSED (500ULL*ZIP_MiB)
#define ZIP_MAX_SIZE_UNCOMPRESSED (1024ULL*ZIP_MiB)
const Act_Action_t ZIP_ActZIPFolder[Brw_NUM_TYPES_FILE_BROWSER] =
{