mirror of https://github.com/acanas/swad-core.git
Version 17.21.1
This commit is contained in:
parent
2a04ef351d
commit
35e18a23ff
|
@ -256,13 +256,14 @@
|
||||||
/****************************** Public constants *****************************/
|
/****************************** Public constants *****************************/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
#define Log_PLATFORM_VERSION "SWAD 17.21 (2017-10-07)"
|
#define Log_PLATFORM_VERSION "SWAD 17.21.1 (2017-10-08)"
|
||||||
#define CSS_FILE "swad17.0.css"
|
#define CSS_FILE "swad17.0.css"
|
||||||
#define JS_FILE "swad17.17.1.js"
|
#define JS_FILE "swad17.17.1.js"
|
||||||
|
|
||||||
// Number of lines (includes comments but not blank lines) has been got with the following command:
|
// 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
|
// nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*?.h sql/swad*.sql | tail -1
|
||||||
/*
|
/*
|
||||||
|
Version 17.21.1: Oct 08, 2017 Remove project directories when removing project. (233114 lines)
|
||||||
Version 17.21: Oct 07, 2017 Start and end dates in projects are replaced by time of creation and time of modification. (233106 lines)
|
Version 17.21: Oct 07, 2017 Start and end dates in projects are replaced by time of creation and time of modification. (233106 lines)
|
||||||
8 changes necessary in database:
|
8 changes necessary in database:
|
||||||
ALTER TABLE projects ADD COLUMN CreatTime DATETIME AFTER EndTime;
|
ALTER TABLE projects ADD COLUMN CreatTime DATETIME AFTER EndTime;
|
||||||
|
|
3378
swad_file_browser.c
3378
swad_file_browser.c
File diff suppressed because it is too large
Load Diff
|
@ -44,34 +44,34 @@
|
||||||
// so don't change numbers!
|
// so don't change numbers!
|
||||||
typedef enum
|
typedef enum
|
||||||
{
|
{
|
||||||
Brw_UNKNOWN = 0,
|
Brw_UNKNOWN = 0,
|
||||||
Brw_SHOW_DOCUM_CRS = 1,
|
Brw_SHOW_DOC_CRS = 1,
|
||||||
Brw_SHOW_MARKS_CRS = 2,
|
Brw_SHOW_MRK_CRS = 2,
|
||||||
Brw_ADMI_DOCUM_CRS = 3,
|
Brw_ADMI_DOC_CRS = 3,
|
||||||
Brw_ADMI_SHARE_CRS = 4,
|
Brw_ADMI_SHR_CRS = 4,
|
||||||
Brw_ADMI_SHARE_GRP = 5,
|
Brw_ADMI_SHR_GRP = 5,
|
||||||
Brw_ADMI_WORKS_USR = 6,
|
Brw_ADMI_WRK_USR = 6,
|
||||||
Brw_ADMI_WORKS_CRS = 7,
|
Brw_ADMI_WRK_CRS = 7,
|
||||||
Brw_ADMI_MARKS_CRS = 8,
|
Brw_ADMI_MRK_CRS = 8,
|
||||||
Brw_ADMI_BRIEF_USR = 9,
|
Brw_ADMI_BRF_USR = 9,
|
||||||
Brw_SHOW_DOCUM_GRP = 10,
|
Brw_SHOW_DOC_GRP = 10,
|
||||||
Brw_ADMI_DOCUM_GRP = 11,
|
Brw_ADMI_DOC_GRP = 11,
|
||||||
Brw_SHOW_MARKS_GRP = 12,
|
Brw_SHOW_MRK_GRP = 12,
|
||||||
Brw_ADMI_MARKS_GRP = 13,
|
Brw_ADMI_MRK_GRP = 13,
|
||||||
Brw_ADMI_ASSIG_USR = 14,
|
Brw_ADMI_ASG_USR = 14,
|
||||||
Brw_ADMI_ASSIG_CRS = 15,
|
Brw_ADMI_ASG_CRS = 15,
|
||||||
Brw_SHOW_DOCUM_DEG = 16,
|
Brw_SHOW_DOC_DEG = 16,
|
||||||
Brw_ADMI_DOCUM_DEG = 17,
|
Brw_ADMI_DOC_DEG = 17,
|
||||||
Brw_SHOW_DOCUM_CTR = 18,
|
Brw_SHOW_DOC_CTR = 18,
|
||||||
Brw_ADMI_DOCUM_CTR = 19,
|
Brw_ADMI_DOC_CTR = 19,
|
||||||
Brw_SHOW_DOCUM_INS = 20,
|
Brw_SHOW_DOC_INS = 20,
|
||||||
Brw_ADMI_DOCUM_INS = 21,
|
Brw_ADMI_DOC_INS = 21,
|
||||||
Brw_ADMI_SHARE_DEG = 22,
|
Brw_ADMI_SHR_DEG = 22,
|
||||||
Brw_ADMI_SHARE_CTR = 23,
|
Brw_ADMI_SHR_CTR = 23,
|
||||||
Brw_ADMI_SHARE_INS = 24,
|
Brw_ADMI_SHR_INS = 24,
|
||||||
Brw_ADMI_TEACH_CRS = 25,
|
Brw_ADMI_TCH_CRS = 25,
|
||||||
Brw_ADMI_TEACH_GRP = 26,
|
Brw_ADMI_TCH_GRP = 26,
|
||||||
Brw_ADMI_DOCUM_PRJ = 27,
|
Brw_ADMI_DOC_PRJ = 27,
|
||||||
} Brw_FileBrowser_t;
|
} Brw_FileBrowser_t;
|
||||||
|
|
||||||
// The following types are stored in files and clipboard tables as numeric fields, so don't change numbers!
|
// The following types are stored in files and clipboard tables as numeric fields, so don't change numbers!
|
||||||
|
@ -147,16 +147,17 @@ struct FileMetadata
|
||||||
#define Brw_MAX_CHARS_LICENSE (128 - 1) // 127
|
#define Brw_MAX_CHARS_LICENSE (128 - 1) // 127
|
||||||
#define Brw_MAX_BYTES_LICENSE ((Brw_MAX_CHARS_LICENSE + 1) * Str_MAX_BYTES_PER_CHAR - 1) // 2047
|
#define Brw_MAX_BYTES_LICENSE ((Brw_MAX_CHARS_LICENSE + 1) * Str_MAX_BYTES_PER_CHAR - 1) // 2047
|
||||||
|
|
||||||
#define Brw_INTERNAL_NAME_ROOT_FOLDER_DOCUMENTS "doc"
|
#define Brw_INTERNAL_NAME_ROOT_FOLDER_DOCUMENTS "doc"
|
||||||
#define Brw_INTERNAL_NAME_ROOT_FOLDER_SHARED_FILES "sha"
|
#define Brw_INTERNAL_NAME_ROOT_FOLDER_SHARED_FILES "sha"
|
||||||
#define Brw_INTERNAL_NAME_ROOT_FOLDER_DOWNLOAD "descarga" // TODO: It should be Brw_INTERNAL_NAME_ROOT_FOLDER_DOCUMENTS
|
#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_TEACHERS "tch"
|
||||||
#define Brw_INTERNAL_NAME_ROOT_FOLDER_SHARED "comun" // TODO: It should be "sha"
|
#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"
|
#define Brw_INTERNAL_NAME_ROOT_FOLDER_ASSIGNMENTS "actividades" // TODO: It should be "asg"
|
||||||
#define Brw_INTERNAL_NAME_ROOT_FOLDER_WORKS "trabajos" // TODO: It should be "wrk"
|
#define Brw_INTERNAL_NAME_ROOT_FOLDER_WORKS "trabajos" // TODO: It should be "wrk"
|
||||||
#define Brw_INTERNAL_NAME_ROOT_FOLDER_PROJECTS "prj"
|
#define Brw_INTERNAL_NAME_ROOT_FOLDER_PROJECT_DOCUMENTS "doc"
|
||||||
#define Brw_INTERNAL_NAME_ROOT_FOLDER_MARKS "calificaciones" // TODO: It should be "mrk"
|
#define Brw_INTERNAL_NAME_ROOT_FOLDER_PROJECT_ASSESSMENT "ass" // For future use
|
||||||
#define Brw_INTERNAL_NAME_ROOT_FOLDER_BRIEF "maletin" // TODO: It should be "brf"
|
#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 3 // 3 months
|
#define Brw_MIN_MONTHS_TO_REMOVE_OLD_FILES 3 // 3 months
|
||||||
#define Brw_DEF_MONTHS_TO_REMOVE_OLD_FILES 6 // 6 months
|
#define Brw_DEF_MONTHS_TO_REMOVE_OLD_FILES 6 // 6 months
|
||||||
|
|
|
@ -1515,10 +1515,10 @@ static unsigned long Ind_GetNumFilesInDocumZonesOfCrsFromDB (long CrsCod)
|
||||||
" AND crs_grp_types.GrpTypCod=crs_grp.GrpTypCod"
|
" AND crs_grp_types.GrpTypCod=crs_grp.GrpTypCod"
|
||||||
" AND file_browser_size.FileBrowser=%u"
|
" AND file_browser_size.FileBrowser=%u"
|
||||||
" AND file_browser_size.Cod=crs_grp.GrpCod)",
|
" AND file_browser_size.Cod=crs_grp.GrpCod)",
|
||||||
(unsigned) Brw_FileBrowserForDB_files[Brw_ADMI_DOCUM_CRS],
|
(unsigned) Brw_FileBrowserForDB_files[Brw_ADMI_DOC_CRS],
|
||||||
CrsCod,
|
CrsCod,
|
||||||
CrsCod,
|
CrsCod,
|
||||||
(unsigned) Brw_FileBrowserForDB_files[Brw_ADMI_DOCUM_GRP]);
|
(unsigned) Brw_FileBrowserForDB_files[Brw_ADMI_DOC_GRP]);
|
||||||
DB_QuerySELECT (Query,&mysql_res,"can not get the number of files");
|
DB_QuerySELECT (Query,&mysql_res,"can not get the number of files");
|
||||||
|
|
||||||
/***** Get row *****/
|
/***** Get row *****/
|
||||||
|
@ -1557,10 +1557,10 @@ static unsigned long Ind_GetNumFilesInShareZonesOfCrsFromDB (long CrsCod)
|
||||||
" AND crs_grp_types.GrpTypCod=crs_grp.GrpTypCod"
|
" AND crs_grp_types.GrpTypCod=crs_grp.GrpTypCod"
|
||||||
" AND file_browser_size.FileBrowser=%u"
|
" AND file_browser_size.FileBrowser=%u"
|
||||||
" AND file_browser_size.Cod=crs_grp.GrpCod)",
|
" AND file_browser_size.Cod=crs_grp.GrpCod)",
|
||||||
(unsigned) Brw_FileBrowserForDB_files[Brw_ADMI_SHARE_CRS],
|
(unsigned) Brw_FileBrowserForDB_files[Brw_ADMI_SHR_CRS],
|
||||||
CrsCod,
|
CrsCod,
|
||||||
CrsCod,
|
CrsCod,
|
||||||
(unsigned) Brw_FileBrowserForDB_files[Brw_ADMI_SHARE_GRP]);
|
(unsigned) Brw_FileBrowserForDB_files[Brw_ADMI_SHR_GRP]);
|
||||||
DB_QuerySELECT (Query,&mysql_res,"can not get the number of files");
|
DB_QuerySELECT (Query,&mysql_res,"can not get the number of files");
|
||||||
|
|
||||||
/***** Get row *****/
|
/***** Get row *****/
|
||||||
|
@ -1592,7 +1592,7 @@ static unsigned long Ind_GetNumFilesInAssigZonesOfCrsFromDB (long CrsCod)
|
||||||
sprintf (Query,"SELECT COALESCE(SUM(NumFiles),0)"
|
sprintf (Query,"SELECT COALESCE(SUM(NumFiles),0)"
|
||||||
" FROM file_browser_size"
|
" FROM file_browser_size"
|
||||||
" WHERE FileBrowser=%u AND Cod=%ld",
|
" WHERE FileBrowser=%u AND Cod=%ld",
|
||||||
(unsigned) Brw_FileBrowserForDB_files[Brw_ADMI_ASSIG_USR],
|
(unsigned) Brw_FileBrowserForDB_files[Brw_ADMI_ASG_USR],
|
||||||
CrsCod);
|
CrsCod);
|
||||||
DB_QuerySELECT (Query,&mysql_res,"can not get the number of files");
|
DB_QuerySELECT (Query,&mysql_res,"can not get the number of files");
|
||||||
|
|
||||||
|
@ -1625,7 +1625,7 @@ static unsigned long Ind_GetNumFilesInWorksZonesOfCrsFromDB (long CrsCod)
|
||||||
sprintf (Query,"SELECT COALESCE(SUM(NumFiles),0)"
|
sprintf (Query,"SELECT COALESCE(SUM(NumFiles),0)"
|
||||||
" FROM file_browser_size"
|
" FROM file_browser_size"
|
||||||
" WHERE FileBrowser=%u AND Cod=%ld",
|
" WHERE FileBrowser=%u AND Cod=%ld",
|
||||||
(unsigned) Brw_FileBrowserForDB_files[Brw_ADMI_WORKS_USR],
|
(unsigned) Brw_FileBrowserForDB_files[Brw_ADMI_WRK_USR],
|
||||||
CrsCod);
|
CrsCod);
|
||||||
DB_QuerySELECT (Query,&mysql_res,"can not get the number of files");
|
DB_QuerySELECT (Query,&mysql_res,"can not get the number of files");
|
||||||
|
|
||||||
|
|
|
@ -205,26 +205,26 @@ void Lay_WriteStartOfPage (void)
|
||||||
// images/spritemap.png
|
// images/spritemap.png
|
||||||
switch (Gbl.Action.Act)
|
switch (Gbl.Action.Act)
|
||||||
{
|
{
|
||||||
case ActFrmCreDocIns: // Brw_ADMI_DOCUM_INS
|
case ActFrmCreDocIns: // Brw_ADMI_DOC_INS
|
||||||
case ActFrmCreShaIns: // Brw_ADMI_SHARE_INS
|
case ActFrmCreShaIns: // Brw_ADMI_SHR_INS
|
||||||
case ActFrmCreDocCtr: // Brw_ADMI_DOCUM_CTR
|
case ActFrmCreDocCtr: // Brw_ADMI_DOC_CTR
|
||||||
case ActFrmCreShaCtr: // Brw_ADMI_SHARE_CTR
|
case ActFrmCreShaCtr: // Brw_ADMI_SHR_CTR
|
||||||
case ActFrmCreDocDeg: // Brw_ADMI_DOCUM_DEG
|
case ActFrmCreDocDeg: // Brw_ADMI_DOC_DEG
|
||||||
case ActFrmCreShaDeg: // Brw_ADMI_SHARE_DEG
|
case ActFrmCreShaDeg: // Brw_ADMI_SHR_DEG
|
||||||
case ActFrmCreDocCrs: // Brw_ADMI_DOCUM_CRS
|
case ActFrmCreDocCrs: // Brw_ADMI_DOC_CRS
|
||||||
case ActFrmCreDocGrp: // Brw_ADMI_DOCUM_GRP
|
case ActFrmCreDocGrp: // Brw_ADMI_DOC_GRP
|
||||||
case ActFrmCreTchCrs: // Brw_ADMI_TEACH_CRS
|
case ActFrmCreTchCrs: // Brw_ADMI_TCH_CRS
|
||||||
case ActFrmCreTchGrp: // Brw_ADMI_TEACH_GRP
|
case ActFrmCreTchGrp: // Brw_ADMI_TCH_GRP
|
||||||
case ActFrmCreShaCrs: // Brw_ADMI_SHARE_CRS
|
case ActFrmCreShaCrs: // Brw_ADMI_SHR_CRS
|
||||||
case ActFrmCreShaGrp: // Brw_ADMI_SHARE_GRP
|
case ActFrmCreShaGrp: // Brw_ADMI_SHR_GRP
|
||||||
case ActFrmCreAsgUsr: // Brw_ADMI_ASSIG_USR
|
case ActFrmCreAsgUsr: // Brw_ADMI_ASG_USR
|
||||||
case ActFrmCreAsgCrs: // Brw_ADMI_ASSIG_CRS
|
case ActFrmCreAsgCrs: // Brw_ADMI_ASG_CRS
|
||||||
case ActFrmCreWrkUsr: // Brw_ADMI_WORKS_USR
|
case ActFrmCreWrkUsr: // Brw_ADMI_WRK_USR
|
||||||
case ActFrmCreWrkCrs: // Brw_ADMI_WORKS_CRS
|
case ActFrmCreWrkCrs: // Brw_ADMI_WRK_CRS
|
||||||
case ActFrmCreDocPrj: // Brw_ADMI_DOCUM_PRJ
|
case ActFrmCreDocPrj: // Brw_ADMI_DOC_PRJ
|
||||||
case ActFrmCreMrkCrs: // Brw_ADMI_MARKS_CRS
|
case ActFrmCreMrkCrs: // Brw_ADMI_MRK_CRS
|
||||||
case ActFrmCreMrkGrp: // Brw_ADMI_MARKS_GRP
|
case ActFrmCreMrkGrp: // Brw_ADMI_MRK_GRP
|
||||||
case ActFrmCreBrf: // Brw_ADMI_BRIEF_USR
|
case ActFrmCreBrf: // Brw_ADMI_BRF_USR
|
||||||
fprintf (Gbl.F.Out,"<link rel=\"StyleSheet\""
|
fprintf (Gbl.F.Out,"<link rel=\"StyleSheet\""
|
||||||
" href=\"%s/dropzone/css/dropzone.css\""
|
" href=\"%s/dropzone/css/dropzone.css\""
|
||||||
" type=\"text/css\" />\n",
|
" type=\"text/css\" />\n",
|
||||||
|
@ -579,26 +579,26 @@ static void Lay_WriteScripts (void)
|
||||||
// css/dropzone.css
|
// css/dropzone.css
|
||||||
// images/spritemap@2x.png
|
// images/spritemap@2x.png
|
||||||
// images/spritemap.png
|
// images/spritemap.png
|
||||||
case ActFrmCreDocIns: // Brw_ADMI_DOCUM_INS
|
case ActFrmCreDocIns: // Brw_ADMI_DOC_INS
|
||||||
case ActFrmCreShaIns: // Brw_ADMI_SHARE_INS
|
case ActFrmCreShaIns: // Brw_ADMI_SHR_INS
|
||||||
case ActFrmCreDocCtr: // Brw_ADMI_DOCUM_CTR
|
case ActFrmCreDocCtr: // Brw_ADMI_DOC_CTR
|
||||||
case ActFrmCreShaCtr: // Brw_ADMI_SHARE_CTR
|
case ActFrmCreShaCtr: // Brw_ADMI_SHR_CTR
|
||||||
case ActFrmCreDocDeg: // Brw_ADMI_DOCUM_DEG
|
case ActFrmCreDocDeg: // Brw_ADMI_DOC_DEG
|
||||||
case ActFrmCreShaDeg: // Brw_ADMI_SHARE_DEG
|
case ActFrmCreShaDeg: // Brw_ADMI_SHR_DEG
|
||||||
case ActFrmCreDocCrs: // Brw_ADMI_DOCUM_CRS
|
case ActFrmCreDocCrs: // Brw_ADMI_DOC_CRS
|
||||||
case ActFrmCreDocGrp: // Brw_ADMI_DOCUM_GRP
|
case ActFrmCreDocGrp: // Brw_ADMI_DOC_GRP
|
||||||
case ActFrmCreTchCrs: // Brw_ADMI_TEACH_CRS
|
case ActFrmCreTchCrs: // Brw_ADMI_TCH_CRS
|
||||||
case ActFrmCreTchGrp: // Brw_ADMI_TEACH_GRP
|
case ActFrmCreTchGrp: // Brw_ADMI_TCH_GRP
|
||||||
case ActFrmCreShaCrs: // Brw_ADMI_SHARE_CRS
|
case ActFrmCreShaCrs: // Brw_ADMI_SHR_CRS
|
||||||
case ActFrmCreShaGrp: // Brw_ADMI_SHARE_GRP
|
case ActFrmCreShaGrp: // Brw_ADMI_SHR_GRP
|
||||||
case ActFrmCreAsgUsr: // Brw_ADMI_ASSIG_USR
|
case ActFrmCreAsgUsr: // Brw_ADMI_ASG_USR
|
||||||
case ActFrmCreAsgCrs: // Brw_ADMI_ASSIG_CRS
|
case ActFrmCreAsgCrs: // Brw_ADMI_ASG_CRS
|
||||||
case ActFrmCreWrkUsr: // Brw_ADMI_WORKS_USR
|
case ActFrmCreWrkUsr: // Brw_ADMI_WRK_USR
|
||||||
case ActFrmCreWrkCrs: // Brw_ADMI_WORKS_CRS
|
case ActFrmCreWrkCrs: // Brw_ADMI_WRK_CRS
|
||||||
case ActFrmCreDocPrj: // Brw_ADMI_DOCUM_PRJ
|
case ActFrmCreDocPrj: // Brw_ADMI_DOC_PRJ
|
||||||
case ActFrmCreMrkCrs: // Brw_ADMI_MARKS_CRS
|
case ActFrmCreMrkCrs: // Brw_ADMI_MRK_CRS
|
||||||
case ActFrmCreMrkGrp: // Brw_ADMI_MARKS_GRP
|
case ActFrmCreMrkGrp: // Brw_ADMI_MRK_GRP
|
||||||
case ActFrmCreBrf: // Brw_ADMI_BRIEF_USR
|
case ActFrmCreBrf: // Brw_ADMI_BRF_USR
|
||||||
// Use charset="windows-1252" to force error messages in windows-1252 (default is UTF-8)
|
// Use charset="windows-1252" to force error messages in windows-1252 (default is UTF-8)
|
||||||
fprintf (Gbl.F.Out,"<script type=\"text/javascript\""
|
fprintf (Gbl.F.Out,"<script type=\"text/javascript\""
|
||||||
" src=\"%s/dropzone/dropzone.js\""
|
" src=\"%s/dropzone/dropzone.js\""
|
||||||
|
|
|
@ -1049,14 +1049,14 @@ void Ntf_MarkNotifOneFileAsRemoved (const char *Path)
|
||||||
|
|
||||||
switch (FileBrowser)
|
switch (FileBrowser)
|
||||||
{
|
{
|
||||||
case Brw_ADMI_DOCUM_CRS:
|
case Brw_ADMI_DOC_CRS:
|
||||||
case Brw_ADMI_DOCUM_GRP:
|
case Brw_ADMI_DOC_GRP:
|
||||||
case Brw_ADMI_TEACH_CRS:
|
case Brw_ADMI_TCH_CRS:
|
||||||
case Brw_ADMI_TEACH_GRP:
|
case Brw_ADMI_TCH_GRP:
|
||||||
case Brw_ADMI_SHARE_CRS:
|
case Brw_ADMI_SHR_CRS:
|
||||||
case Brw_ADMI_SHARE_GRP:
|
case Brw_ADMI_SHR_GRP:
|
||||||
case Brw_ADMI_MARKS_CRS:
|
case Brw_ADMI_MRK_CRS:
|
||||||
case Brw_ADMI_MARKS_GRP:
|
case Brw_ADMI_MRK_GRP:
|
||||||
/***** Get file code *****/
|
/***** Get file code *****/
|
||||||
FilCod = Brw_GetFilCodByPath (Path,false); // Any file, public or not
|
FilCod = Brw_GetFilCodByPath (Path,false); // Any file, public or not
|
||||||
if (FilCod > 0)
|
if (FilCod > 0)
|
||||||
|
@ -1064,20 +1064,20 @@ void Ntf_MarkNotifOneFileAsRemoved (const char *Path)
|
||||||
/***** Set notification as removed *****/
|
/***** Set notification as removed *****/
|
||||||
switch (FileBrowser)
|
switch (FileBrowser)
|
||||||
{
|
{
|
||||||
case Brw_ADMI_DOCUM_CRS:
|
case Brw_ADMI_DOC_CRS:
|
||||||
case Brw_ADMI_DOCUM_GRP:
|
case Brw_ADMI_DOC_GRP:
|
||||||
NotifyEvent = Ntf_EVENT_DOCUMENT_FILE;
|
NotifyEvent = Ntf_EVENT_DOCUMENT_FILE;
|
||||||
break;
|
break;
|
||||||
case Brw_ADMI_TEACH_CRS:
|
case Brw_ADMI_TCH_CRS:
|
||||||
case Brw_ADMI_TEACH_GRP:
|
case Brw_ADMI_TCH_GRP:
|
||||||
NotifyEvent = Ntf_EVENT_TEACHERS_FILE;
|
NotifyEvent = Ntf_EVENT_TEACHERS_FILE;
|
||||||
break;
|
break;
|
||||||
case Brw_ADMI_SHARE_CRS:
|
case Brw_ADMI_SHR_CRS:
|
||||||
case Brw_ADMI_SHARE_GRP:
|
case Brw_ADMI_SHR_GRP:
|
||||||
NotifyEvent = Ntf_EVENT_SHARED_FILE;
|
NotifyEvent = Ntf_EVENT_SHARED_FILE;
|
||||||
break;
|
break;
|
||||||
case Brw_ADMI_MARKS_CRS:
|
case Brw_ADMI_MRK_CRS:
|
||||||
case Brw_ADMI_MARKS_GRP:
|
case Brw_ADMI_MRK_GRP:
|
||||||
NotifyEvent = Ntf_EVENT_MARKS_FILE;
|
NotifyEvent = Ntf_EVENT_MARKS_FILE;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
@ -1105,31 +1105,31 @@ void Ntf_MarkNotifChildrenOfFolderAsRemoved (const char *Path)
|
||||||
|
|
||||||
switch (FileBrowser)
|
switch (FileBrowser)
|
||||||
{
|
{
|
||||||
case Brw_ADMI_DOCUM_CRS:
|
case Brw_ADMI_DOC_CRS:
|
||||||
case Brw_ADMI_DOCUM_GRP:
|
case Brw_ADMI_DOC_GRP:
|
||||||
case Brw_ADMI_TEACH_CRS:
|
case Brw_ADMI_TCH_CRS:
|
||||||
case Brw_ADMI_TEACH_GRP:
|
case Brw_ADMI_TCH_GRP:
|
||||||
case Brw_ADMI_SHARE_CRS:
|
case Brw_ADMI_SHR_CRS:
|
||||||
case Brw_ADMI_SHARE_GRP:
|
case Brw_ADMI_SHR_GRP:
|
||||||
case Brw_ADMI_MARKS_CRS:
|
case Brw_ADMI_MRK_CRS:
|
||||||
case Brw_ADMI_MARKS_GRP:
|
case Brw_ADMI_MRK_GRP:
|
||||||
/***** Set notification as removed *****/
|
/***** Set notification as removed *****/
|
||||||
switch (FileBrowser)
|
switch (FileBrowser)
|
||||||
{
|
{
|
||||||
case Brw_ADMI_DOCUM_CRS:
|
case Brw_ADMI_DOC_CRS:
|
||||||
case Brw_ADMI_DOCUM_GRP:
|
case Brw_ADMI_DOC_GRP:
|
||||||
NotifyEvent = Ntf_EVENT_DOCUMENT_FILE;
|
NotifyEvent = Ntf_EVENT_DOCUMENT_FILE;
|
||||||
break;
|
break;
|
||||||
case Brw_ADMI_TEACH_CRS:
|
case Brw_ADMI_TCH_CRS:
|
||||||
case Brw_ADMI_TEACH_GRP:
|
case Brw_ADMI_TCH_GRP:
|
||||||
NotifyEvent = Ntf_EVENT_TEACHERS_FILE;
|
NotifyEvent = Ntf_EVENT_TEACHERS_FILE;
|
||||||
break;
|
break;
|
||||||
case Brw_ADMI_SHARE_CRS:
|
case Brw_ADMI_SHR_CRS:
|
||||||
case Brw_ADMI_SHARE_GRP:
|
case Brw_ADMI_SHR_GRP:
|
||||||
NotifyEvent = Ntf_EVENT_SHARED_FILE;
|
NotifyEvent = Ntf_EVENT_SHARED_FILE;
|
||||||
break;
|
break;
|
||||||
case Brw_ADMI_MARKS_CRS:
|
case Brw_ADMI_MRK_CRS:
|
||||||
case Brw_ADMI_MARKS_GRP:
|
case Brw_ADMI_MRK_GRP:
|
||||||
NotifyEvent = Ntf_EVENT_MARKS_FILE;
|
NotifyEvent = Ntf_EVENT_MARKS_FILE;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
@ -1169,10 +1169,10 @@ void Ntf_MarkNotifFilesInGroupAsRemoved (long GrpCod)
|
||||||
(unsigned) Ntf_EVENT_TEACHERS_FILE,
|
(unsigned) Ntf_EVENT_TEACHERS_FILE,
|
||||||
(unsigned) Ntf_EVENT_SHARED_FILE,
|
(unsigned) Ntf_EVENT_SHARED_FILE,
|
||||||
(unsigned) Ntf_EVENT_MARKS_FILE,
|
(unsigned) Ntf_EVENT_MARKS_FILE,
|
||||||
(unsigned) Brw_ADMI_DOCUM_GRP,
|
(unsigned) Brw_ADMI_DOC_GRP,
|
||||||
(unsigned) Brw_ADMI_TEACH_GRP,
|
(unsigned) Brw_ADMI_TCH_GRP,
|
||||||
(unsigned) Brw_ADMI_SHARE_GRP,
|
(unsigned) Brw_ADMI_SHR_GRP,
|
||||||
(unsigned) Brw_ADMI_MARKS_GRP,
|
(unsigned) Brw_ADMI_MRK_GRP,
|
||||||
GrpCod);
|
GrpCod);
|
||||||
DB_QueryUPDATE (Query,"can not set notification(s) as removed");
|
DB_QueryUPDATE (Query,"can not set notification(s) as removed");
|
||||||
}
|
}
|
||||||
|
@ -1207,16 +1207,16 @@ unsigned Ntf_StoreNotifyEventsToAllUsrs (Ntf_NotifyEvent_t NotifyEvent,long Cod)
|
||||||
case Ntf_EVENT_MARKS_FILE:
|
case Ntf_EVENT_MARKS_FILE:
|
||||||
switch (Gbl.FileBrowser.Type)
|
switch (Gbl.FileBrowser.Type)
|
||||||
{
|
{
|
||||||
case Brw_ADMI_DOCUM_CRS:
|
case Brw_ADMI_DOC_CRS:
|
||||||
case Brw_ADMI_SHARE_CRS:
|
case Brw_ADMI_SHR_CRS:
|
||||||
case Brw_ADMI_MARKS_CRS: // Notify all users in course except me
|
case Brw_ADMI_MRK_CRS: // Notify all users in course except me
|
||||||
sprintf (Query,"SELECT UsrCod FROM crs_usr"
|
sprintf (Query,"SELECT UsrCod FROM crs_usr"
|
||||||
" WHERE CrsCod=%ld"
|
" WHERE CrsCod=%ld"
|
||||||
" AND UsrCod<>%ld",
|
" AND UsrCod<>%ld",
|
||||||
Gbl.CurrentCrs.Crs.CrsCod,
|
Gbl.CurrentCrs.Crs.CrsCod,
|
||||||
Gbl.Usrs.Me.UsrDat.UsrCod);
|
Gbl.Usrs.Me.UsrDat.UsrCod);
|
||||||
break;
|
break;
|
||||||
case Brw_ADMI_TEACH_CRS: // Notify all teachers in course except me
|
case Brw_ADMI_TCH_CRS: // Notify all teachers in course except me
|
||||||
sprintf (Query,"SELECT UsrCod FROM crs_usr"
|
sprintf (Query,"SELECT UsrCod FROM crs_usr"
|
||||||
" WHERE CrsCod=%ld"
|
" WHERE CrsCod=%ld"
|
||||||
" AND UsrCod<>%ld"
|
" AND UsrCod<>%ld"
|
||||||
|
@ -1225,16 +1225,16 @@ unsigned Ntf_StoreNotifyEventsToAllUsrs (Ntf_NotifyEvent_t NotifyEvent,long Cod)
|
||||||
Gbl.Usrs.Me.UsrDat.UsrCod,
|
Gbl.Usrs.Me.UsrDat.UsrCod,
|
||||||
(unsigned) Rol_TCH);
|
(unsigned) Rol_TCH);
|
||||||
break;
|
break;
|
||||||
case Brw_ADMI_DOCUM_GRP:
|
case Brw_ADMI_DOC_GRP:
|
||||||
case Brw_ADMI_SHARE_GRP:
|
case Brw_ADMI_SHR_GRP:
|
||||||
case Brw_ADMI_MARKS_GRP: // Notify all users in group except me
|
case Brw_ADMI_MRK_GRP: // Notify all users in group except me
|
||||||
sprintf (Query,"SELECT UsrCod FROM crs_grp_usr"
|
sprintf (Query,"SELECT UsrCod FROM crs_grp_usr"
|
||||||
" WHERE crs_grp_usr.GrpCod=%ld"
|
" WHERE crs_grp_usr.GrpCod=%ld"
|
||||||
" AND crs_grp_usr.UsrCod<>%ld",
|
" AND crs_grp_usr.UsrCod<>%ld",
|
||||||
Gbl.CurrentCrs.Grps.GrpCod,
|
Gbl.CurrentCrs.Grps.GrpCod,
|
||||||
Gbl.Usrs.Me.UsrDat.UsrCod);
|
Gbl.Usrs.Me.UsrDat.UsrCod);
|
||||||
break;
|
break;
|
||||||
case Brw_ADMI_TEACH_GRP: // Notify all teachers in group except me
|
case Brw_ADMI_TCH_GRP: // Notify all teachers in group except me
|
||||||
sprintf (Query,"SELECT crs_grp_usr.UsrCod"
|
sprintf (Query,"SELECT crs_grp_usr.UsrCod"
|
||||||
" FROM crs_grp_usr,crs_grp,crs_grp_types,crs_usr"
|
" FROM crs_grp_usr,crs_grp,crs_grp_types,crs_usr"
|
||||||
" WHERE crs_grp_usr.GrpCod=%ld"
|
" WHERE crs_grp_usr.GrpCod=%ld"
|
||||||
|
|
|
@ -2289,6 +2289,7 @@ void Prj_RemoveProject (void)
|
||||||
extern const char *Txt_Project_X_removed;
|
extern const char *Txt_Project_X_removed;
|
||||||
char Query[256];
|
char Query[256];
|
||||||
struct Project Prj;
|
struct Project Prj;
|
||||||
|
char PathRelPrj[PATH_MAX + 1];
|
||||||
|
|
||||||
/***** Allocate memory for the project *****/
|
/***** Allocate memory for the project *****/
|
||||||
Prj_AllocMemProject (&Prj);
|
Prj_AllocMemProject (&Prj);
|
||||||
|
@ -2318,6 +2319,12 @@ void Prj_RemoveProject (void)
|
||||||
Prj.PrjCod,Gbl.CurrentCrs.Crs.CrsCod);
|
Prj.PrjCod,Gbl.CurrentCrs.Crs.CrsCod);
|
||||||
DB_QueryDELETE (Query,"can not remove project");
|
DB_QueryDELETE (Query,"can not remove project");
|
||||||
|
|
||||||
|
/***** Remove directory of the project *****/
|
||||||
|
sprintf (PathRelPrj,"%s/%s/%ld/%s/%02u/%ld",
|
||||||
|
Cfg_PATH_SWAD_PRIVATE,Cfg_FOLDER_CRS,Prj.CrsCod,Cfg_FOLDER_PRJ,
|
||||||
|
(unsigned) (Prj.PrjCod % 100),Prj.PrjCod);
|
||||||
|
Fil_RemoveTree (PathRelPrj);
|
||||||
|
|
||||||
/***** Write message to show the change made *****/
|
/***** Write message to show the change made *****/
|
||||||
sprintf (Gbl.Alert.Txt,Txt_Project_X_removed,
|
sprintf (Gbl.Alert.Txt,Txt_Project_X_removed,
|
||||||
Prj.Title);
|
Prj.Title);
|
||||||
|
|
|
@ -935,20 +935,20 @@ static unsigned Sch_SearchOpenDocumentsInDB (const char *RangeQuery)
|
||||||
" WHERE PathFromRoot<>''"
|
" WHERE PathFromRoot<>''"
|
||||||
" ORDER BY InsShortName,CtrShortName,DegShortName,CrsShortName,PathFromRoot",
|
" ORDER BY InsShortName,CtrShortName,DegShortName,CrsShortName,PathFromRoot",
|
||||||
SearchQuery,
|
SearchQuery,
|
||||||
(unsigned) Brw_ADMI_DOCUM_INS,
|
(unsigned) Brw_ADMI_DOC_INS,
|
||||||
(unsigned) Brw_ADMI_SHARE_INS,
|
(unsigned) Brw_ADMI_SHR_INS,
|
||||||
RangeQuery,
|
RangeQuery,
|
||||||
SearchQuery,
|
SearchQuery,
|
||||||
(unsigned) Brw_ADMI_DOCUM_CTR,
|
(unsigned) Brw_ADMI_DOC_CTR,
|
||||||
(unsigned) Brw_ADMI_SHARE_CTR,
|
(unsigned) Brw_ADMI_SHR_CTR,
|
||||||
RangeQuery,
|
RangeQuery,
|
||||||
SearchQuery,
|
SearchQuery,
|
||||||
(unsigned) Brw_ADMI_DOCUM_DEG,
|
(unsigned) Brw_ADMI_DOC_DEG,
|
||||||
(unsigned) Brw_ADMI_SHARE_DEG,
|
(unsigned) Brw_ADMI_SHR_DEG,
|
||||||
RangeQuery,
|
RangeQuery,
|
||||||
SearchQuery,
|
SearchQuery,
|
||||||
(unsigned) Brw_ADMI_DOCUM_CRS,
|
(unsigned) Brw_ADMI_DOC_CRS,
|
||||||
(unsigned) Brw_ADMI_SHARE_CRS,
|
(unsigned) Brw_ADMI_SHR_CRS,
|
||||||
RangeQuery);
|
RangeQuery);
|
||||||
|
|
||||||
/***** Query database and list documents found *****/
|
/***** Query database and list documents found *****/
|
||||||
|
@ -994,10 +994,10 @@ static unsigned Sch_SearchDocumentsInMyCoursesInDB (const char *RangeQuery)
|
||||||
" AND crs_usr.CrsCod=files.Cod"
|
" AND crs_usr.CrsCod=files.Cod"
|
||||||
" AND files.FileBrowser IN (%u,%u,%u,%u)",
|
" AND files.FileBrowser IN (%u,%u,%u,%u)",
|
||||||
Gbl.Usrs.Me.UsrDat.UsrCod,
|
Gbl.Usrs.Me.UsrDat.UsrCod,
|
||||||
(unsigned) Brw_ADMI_DOCUM_CRS,
|
(unsigned) Brw_ADMI_DOC_CRS,
|
||||||
(unsigned) Brw_ADMI_TEACH_CRS,
|
(unsigned) Brw_ADMI_TCH_CRS,
|
||||||
(unsigned) Brw_ADMI_SHARE_CRS,
|
(unsigned) Brw_ADMI_SHR_CRS,
|
||||||
(unsigned) Brw_ADMI_MARKS_CRS);
|
(unsigned) Brw_ADMI_MRK_CRS);
|
||||||
if (mysql_query (&Gbl.mysql,Query))
|
if (mysql_query (&Gbl.mysql,Query))
|
||||||
DB_ExitOnMySQLError ("can not create temporary table");
|
DB_ExitOnMySQLError ("can not create temporary table");
|
||||||
|
|
||||||
|
@ -1009,10 +1009,10 @@ static unsigned Sch_SearchDocumentsInMyCoursesInDB (const char *RangeQuery)
|
||||||
" AND crs_grp_usr.GrpCod=files.Cod"
|
" AND crs_grp_usr.GrpCod=files.Cod"
|
||||||
" AND files.FileBrowser IN (%u,%u,%u,%u)",
|
" AND files.FileBrowser IN (%u,%u,%u,%u)",
|
||||||
Gbl.Usrs.Me.UsrDat.UsrCod,
|
Gbl.Usrs.Me.UsrDat.UsrCod,
|
||||||
(unsigned) Brw_ADMI_DOCUM_GRP,
|
(unsigned) Brw_ADMI_DOC_GRP,
|
||||||
(unsigned) Brw_ADMI_TEACH_GRP,
|
(unsigned) Brw_ADMI_TCH_GRP,
|
||||||
(unsigned) Brw_ADMI_SHARE_GRP,
|
(unsigned) Brw_ADMI_SHR_GRP,
|
||||||
(unsigned) Brw_ADMI_MARKS_GRP);
|
(unsigned) Brw_ADMI_MRK_GRP);
|
||||||
/* if (Gbl.Usrs.Me.Roles.LoggedRole == Rol_SYS_ADM)
|
/* if (Gbl.Usrs.Me.Roles.LoggedRole == Rol_SYS_ADM)
|
||||||
Lay_ShowAlert (Lay_INFO,Query); */
|
Lay_ShowAlert (Lay_INFO,Query); */
|
||||||
if (mysql_query (&Gbl.mysql,Query))
|
if (mysql_query (&Gbl.mysql,Query))
|
||||||
|
@ -1060,16 +1060,16 @@ static unsigned Sch_SearchDocumentsInMyCoursesInDB (const char *RangeQuery)
|
||||||
" WHERE PathFromRoot<>''"
|
" WHERE PathFromRoot<>''"
|
||||||
" ORDER BY InsShortName,CtrShortName,DegShortName,CrsShortName,PathFromRoot",
|
" ORDER BY InsShortName,CtrShortName,DegShortName,CrsShortName,PathFromRoot",
|
||||||
SearchQuery,
|
SearchQuery,
|
||||||
(unsigned) Brw_ADMI_DOCUM_CRS,
|
(unsigned) Brw_ADMI_DOC_CRS,
|
||||||
(unsigned) Brw_ADMI_TEACH_CRS,
|
(unsigned) Brw_ADMI_TCH_CRS,
|
||||||
(unsigned) Brw_ADMI_SHARE_CRS,
|
(unsigned) Brw_ADMI_SHR_CRS,
|
||||||
(unsigned) Brw_ADMI_MARKS_CRS,
|
(unsigned) Brw_ADMI_MRK_CRS,
|
||||||
RangeQuery,
|
RangeQuery,
|
||||||
SearchQuery,
|
SearchQuery,
|
||||||
(unsigned) Brw_ADMI_DOCUM_GRP,
|
(unsigned) Brw_ADMI_DOC_GRP,
|
||||||
(unsigned) Brw_ADMI_TEACH_GRP,
|
(unsigned) Brw_ADMI_TCH_GRP,
|
||||||
(unsigned) Brw_ADMI_SHARE_GRP,
|
(unsigned) Brw_ADMI_SHR_GRP,
|
||||||
(unsigned) Brw_ADMI_MARKS_GRP,
|
(unsigned) Brw_ADMI_MRK_GRP,
|
||||||
RangeQuery);
|
RangeQuery);
|
||||||
|
|
||||||
/***** Query database and list documents found *****/
|
/***** Query database and list documents found *****/
|
||||||
|
@ -1205,31 +1205,31 @@ static unsigned Sch_SearchMyDocumentsInDB (const char *RangeQuery)
|
||||||
" WHERE PathFromRoot<>''"
|
" WHERE PathFromRoot<>''"
|
||||||
" ORDER BY InsShortName,CtrShortName,DegShortName,CrsShortName,PathFromRoot",
|
" ORDER BY InsShortName,CtrShortName,DegShortName,CrsShortName,PathFromRoot",
|
||||||
Gbl.Usrs.Me.UsrDat.UsrCod,SearchQuery,
|
Gbl.Usrs.Me.UsrDat.UsrCod,SearchQuery,
|
||||||
(unsigned) Brw_ADMI_DOCUM_INS,
|
(unsigned) Brw_ADMI_DOC_INS,
|
||||||
(unsigned) Brw_ADMI_SHARE_INS,
|
(unsigned) Brw_ADMI_SHR_INS,
|
||||||
RangeQuery,
|
RangeQuery,
|
||||||
Gbl.Usrs.Me.UsrDat.UsrCod,SearchQuery,
|
Gbl.Usrs.Me.UsrDat.UsrCod,SearchQuery,
|
||||||
(unsigned) Brw_ADMI_DOCUM_CTR,
|
(unsigned) Brw_ADMI_DOC_CTR,
|
||||||
(unsigned) Brw_ADMI_SHARE_CTR,
|
(unsigned) Brw_ADMI_SHR_CTR,
|
||||||
RangeQuery,
|
RangeQuery,
|
||||||
Gbl.Usrs.Me.UsrDat.UsrCod,SearchQuery,
|
Gbl.Usrs.Me.UsrDat.UsrCod,SearchQuery,
|
||||||
(unsigned) Brw_ADMI_DOCUM_DEG,
|
(unsigned) Brw_ADMI_DOC_DEG,
|
||||||
(unsigned) Brw_ADMI_SHARE_DEG,
|
(unsigned) Brw_ADMI_SHR_DEG,
|
||||||
RangeQuery,
|
RangeQuery,
|
||||||
Gbl.Usrs.Me.UsrDat.UsrCod,SearchQuery,
|
Gbl.Usrs.Me.UsrDat.UsrCod,SearchQuery,
|
||||||
(unsigned) Brw_ADMI_DOCUM_CRS,
|
(unsigned) Brw_ADMI_DOC_CRS,
|
||||||
(unsigned) Brw_ADMI_TEACH_CRS,
|
(unsigned) Brw_ADMI_TCH_CRS,
|
||||||
(unsigned) Brw_ADMI_SHARE_CRS,
|
(unsigned) Brw_ADMI_SHR_CRS,
|
||||||
(unsigned) Brw_ADMI_MARKS_CRS,
|
(unsigned) Brw_ADMI_MRK_CRS,
|
||||||
RangeQuery,
|
RangeQuery,
|
||||||
Gbl.Usrs.Me.UsrDat.UsrCod,SearchQuery,
|
Gbl.Usrs.Me.UsrDat.UsrCod,SearchQuery,
|
||||||
(unsigned) Brw_ADMI_DOCUM_GRP,
|
(unsigned) Brw_ADMI_DOC_GRP,
|
||||||
(unsigned) Brw_ADMI_TEACH_GRP,
|
(unsigned) Brw_ADMI_TCH_GRP,
|
||||||
(unsigned) Brw_ADMI_SHARE_GRP,
|
(unsigned) Brw_ADMI_SHR_GRP,
|
||||||
(unsigned) Brw_ADMI_MARKS_GRP,
|
(unsigned) Brw_ADMI_MRK_GRP,
|
||||||
RangeQuery,
|
RangeQuery,
|
||||||
Gbl.Usrs.Me.UsrDat.UsrCod,SearchQuery,
|
Gbl.Usrs.Me.UsrDat.UsrCod,SearchQuery,
|
||||||
(unsigned) Brw_ADMI_BRIEF_USR);
|
(unsigned) Brw_ADMI_BRF_USR);
|
||||||
|
|
||||||
/***** Query database and list documents found *****/
|
/***** Query database and list documents found *****/
|
||||||
/* if (Gbl.Usrs.Me.Roles.LoggedRole == Rol_SYS_ADM)
|
/* if (Gbl.Usrs.Me.Roles.LoggedRole == Rol_SYS_ADM)
|
||||||
|
|
|
@ -1997,14 +1997,14 @@ void Soc_MarkSocialNoteOneFileAsUnavailable (const char *Path)
|
||||||
|
|
||||||
switch (FileBrowser)
|
switch (FileBrowser)
|
||||||
{
|
{
|
||||||
case Brw_ADMI_DOCUM_INS:
|
case Brw_ADMI_DOC_INS:
|
||||||
case Brw_ADMI_SHARE_INS:
|
case Brw_ADMI_SHR_INS:
|
||||||
case Brw_ADMI_DOCUM_CTR:
|
case Brw_ADMI_DOC_CTR:
|
||||||
case Brw_ADMI_SHARE_CTR:
|
case Brw_ADMI_SHR_CTR:
|
||||||
case Brw_ADMI_DOCUM_DEG:
|
case Brw_ADMI_DOC_DEG:
|
||||||
case Brw_ADMI_SHARE_DEG:
|
case Brw_ADMI_SHR_DEG:
|
||||||
case Brw_ADMI_DOCUM_CRS:
|
case Brw_ADMI_DOC_CRS:
|
||||||
case Brw_ADMI_SHARE_CRS:
|
case Brw_ADMI_SHR_CRS:
|
||||||
/***** Get file code *****/
|
/***** Get file code *****/
|
||||||
FilCod = Brw_GetFilCodByPath (Path,true); // Only if file is public
|
FilCod = Brw_GetFilCodByPath (Path,true); // Only if file is public
|
||||||
if (FilCod > 0)
|
if (FilCod > 0)
|
||||||
|
@ -2012,28 +2012,28 @@ void Soc_MarkSocialNoteOneFileAsUnavailable (const char *Path)
|
||||||
/***** Mark possible social note as unavailable *****/
|
/***** Mark possible social note as unavailable *****/
|
||||||
switch (FileBrowser)
|
switch (FileBrowser)
|
||||||
{
|
{
|
||||||
case Brw_ADMI_DOCUM_INS:
|
case Brw_ADMI_DOC_INS:
|
||||||
NoteType = Soc_NOTE_INS_DOC_PUB_FILE;
|
NoteType = Soc_NOTE_INS_DOC_PUB_FILE;
|
||||||
break;
|
break;
|
||||||
case Brw_ADMI_SHARE_INS:
|
case Brw_ADMI_SHR_INS:
|
||||||
NoteType = Soc_NOTE_INS_SHA_PUB_FILE;
|
NoteType = Soc_NOTE_INS_SHA_PUB_FILE;
|
||||||
break;
|
break;
|
||||||
case Brw_ADMI_DOCUM_CTR:
|
case Brw_ADMI_DOC_CTR:
|
||||||
NoteType = Soc_NOTE_CTR_DOC_PUB_FILE;
|
NoteType = Soc_NOTE_CTR_DOC_PUB_FILE;
|
||||||
break;
|
break;
|
||||||
case Brw_ADMI_SHARE_CTR:
|
case Brw_ADMI_SHR_CTR:
|
||||||
NoteType = Soc_NOTE_CTR_SHA_PUB_FILE;
|
NoteType = Soc_NOTE_CTR_SHA_PUB_FILE;
|
||||||
break;
|
break;
|
||||||
case Brw_ADMI_DOCUM_DEG:
|
case Brw_ADMI_DOC_DEG:
|
||||||
NoteType = Soc_NOTE_DEG_DOC_PUB_FILE;
|
NoteType = Soc_NOTE_DEG_DOC_PUB_FILE;
|
||||||
break;
|
break;
|
||||||
case Brw_ADMI_SHARE_DEG:
|
case Brw_ADMI_SHR_DEG:
|
||||||
NoteType = Soc_NOTE_DEG_SHA_PUB_FILE;
|
NoteType = Soc_NOTE_DEG_SHA_PUB_FILE;
|
||||||
break;
|
break;
|
||||||
case Brw_ADMI_DOCUM_CRS:
|
case Brw_ADMI_DOC_CRS:
|
||||||
NoteType = Soc_NOTE_CRS_DOC_PUB_FILE;
|
NoteType = Soc_NOTE_CRS_DOC_PUB_FILE;
|
||||||
break;
|
break;
|
||||||
case Brw_ADMI_SHARE_CRS:
|
case Brw_ADMI_SHR_CRS:
|
||||||
NoteType = Soc_NOTE_CRS_SHA_PUB_FILE;
|
NoteType = Soc_NOTE_CRS_SHA_PUB_FILE;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
@ -2061,39 +2061,39 @@ void Soc_MarkSocialNotesChildrenOfFolderAsUnavailable (const char *Path)
|
||||||
|
|
||||||
switch (FileBrowser)
|
switch (FileBrowser)
|
||||||
{
|
{
|
||||||
case Brw_ADMI_DOCUM_INS:
|
case Brw_ADMI_DOC_INS:
|
||||||
case Brw_ADMI_SHARE_INS:
|
case Brw_ADMI_SHR_INS:
|
||||||
case Brw_ADMI_DOCUM_CTR:
|
case Brw_ADMI_DOC_CTR:
|
||||||
case Brw_ADMI_SHARE_CTR:
|
case Brw_ADMI_SHR_CTR:
|
||||||
case Brw_ADMI_DOCUM_DEG:
|
case Brw_ADMI_DOC_DEG:
|
||||||
case Brw_ADMI_SHARE_DEG:
|
case Brw_ADMI_SHR_DEG:
|
||||||
case Brw_ADMI_DOCUM_CRS:
|
case Brw_ADMI_DOC_CRS:
|
||||||
case Brw_ADMI_SHARE_CRS:
|
case Brw_ADMI_SHR_CRS:
|
||||||
/***** Mark possible social note as unavailable *****/
|
/***** Mark possible social note as unavailable *****/
|
||||||
switch (FileBrowser)
|
switch (FileBrowser)
|
||||||
{
|
{
|
||||||
case Brw_ADMI_DOCUM_INS:
|
case Brw_ADMI_DOC_INS:
|
||||||
NoteType = Soc_NOTE_INS_DOC_PUB_FILE;
|
NoteType = Soc_NOTE_INS_DOC_PUB_FILE;
|
||||||
break;
|
break;
|
||||||
case Brw_ADMI_SHARE_INS:
|
case Brw_ADMI_SHR_INS:
|
||||||
NoteType = Soc_NOTE_INS_SHA_PUB_FILE;
|
NoteType = Soc_NOTE_INS_SHA_PUB_FILE;
|
||||||
break;
|
break;
|
||||||
case Brw_ADMI_DOCUM_CTR:
|
case Brw_ADMI_DOC_CTR:
|
||||||
NoteType = Soc_NOTE_CTR_DOC_PUB_FILE;
|
NoteType = Soc_NOTE_CTR_DOC_PUB_FILE;
|
||||||
break;
|
break;
|
||||||
case Brw_ADMI_SHARE_CTR:
|
case Brw_ADMI_SHR_CTR:
|
||||||
NoteType = Soc_NOTE_CTR_SHA_PUB_FILE;
|
NoteType = Soc_NOTE_CTR_SHA_PUB_FILE;
|
||||||
break;
|
break;
|
||||||
case Brw_ADMI_DOCUM_DEG:
|
case Brw_ADMI_DOC_DEG:
|
||||||
NoteType = Soc_NOTE_DEG_DOC_PUB_FILE;
|
NoteType = Soc_NOTE_DEG_DOC_PUB_FILE;
|
||||||
break;
|
break;
|
||||||
case Brw_ADMI_SHARE_DEG:
|
case Brw_ADMI_SHR_DEG:
|
||||||
NoteType = Soc_NOTE_DEG_SHA_PUB_FILE;
|
NoteType = Soc_NOTE_DEG_SHA_PUB_FILE;
|
||||||
break;
|
break;
|
||||||
case Brw_ADMI_DOCUM_CRS:
|
case Brw_ADMI_DOC_CRS:
|
||||||
NoteType = Soc_NOTE_CRS_DOC_PUB_FILE;
|
NoteType = Soc_NOTE_CRS_DOC_PUB_FILE;
|
||||||
break;
|
break;
|
||||||
case Brw_ADMI_SHARE_CRS:
|
case Brw_ADMI_SHR_CRS:
|
||||||
NoteType = Soc_NOTE_CRS_SHA_PUB_FILE;
|
NoteType = Soc_NOTE_CRS_SHA_PUB_FILE;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
|
294
swad_statistic.c
294
swad_statistic.c
|
@ -5459,16 +5459,16 @@ static void Sta_GetAndShowFileBrowsersStats (void)
|
||||||
extern const char *Txt_Briefcases;
|
extern const char *Txt_Briefcases;
|
||||||
static const Brw_FileBrowser_t StatCrsFileZones[Sta_NUM_STAT_CRS_FILE_ZONES] =
|
static const Brw_FileBrowser_t StatCrsFileZones[Sta_NUM_STAT_CRS_FILE_ZONES] =
|
||||||
{
|
{
|
||||||
Brw_ADMI_DOCUM_CRS,
|
Brw_ADMI_DOC_CRS,
|
||||||
Brw_ADMI_DOCUM_GRP,
|
Brw_ADMI_DOC_GRP,
|
||||||
Brw_ADMI_TEACH_CRS,
|
Brw_ADMI_TCH_CRS,
|
||||||
Brw_ADMI_TEACH_GRP,
|
Brw_ADMI_TCH_GRP,
|
||||||
Brw_ADMI_SHARE_CRS,
|
Brw_ADMI_SHR_CRS,
|
||||||
Brw_ADMI_SHARE_GRP,
|
Brw_ADMI_SHR_GRP,
|
||||||
Brw_ADMI_MARKS_CRS,
|
Brw_ADMI_MRK_CRS,
|
||||||
Brw_ADMI_MARKS_GRP,
|
Brw_ADMI_MRK_GRP,
|
||||||
Brw_ADMI_ASSIG_USR,
|
Brw_ADMI_ASG_USR,
|
||||||
Brw_ADMI_WORKS_USR,
|
Brw_ADMI_WRK_USR,
|
||||||
Brw_UNKNOWN,
|
Brw_UNKNOWN,
|
||||||
};
|
};
|
||||||
unsigned NumStat;
|
unsigned NumStat;
|
||||||
|
@ -5490,7 +5490,7 @@ static void Sta_GetAndShowFileBrowsersStats (void)
|
||||||
Sta_WriteStatsExpTreesTableHead ();
|
Sta_WriteStatsExpTreesTableHead ();
|
||||||
|
|
||||||
/***** Write size of briefcases *****/
|
/***** Write size of briefcases *****/
|
||||||
Sta_WriteRowStatsFileBrowsers (Brw_ADMI_BRIEF_USR,Txt_Briefcases);
|
Sta_WriteRowStatsFileBrowsers (Brw_ADMI_BRF_USR,Txt_Briefcases);
|
||||||
|
|
||||||
/***** End table and box *****/
|
/***** End table and box *****/
|
||||||
Box_EndBoxTable ();
|
Box_EndBoxTable ();
|
||||||
|
@ -5769,21 +5769,21 @@ static void Sta_GetSizeOfFileZoneFromDB (Sco_Scope_t Scope,
|
||||||
" AND crs_grp.GrpCod=file_browser_size.Cod"
|
" AND crs_grp.GrpCod=file_browser_size.Cod"
|
||||||
" AND file_browser_size.FileBrowser IN (%u,%u,%u,%u)"
|
" AND file_browser_size.FileBrowser IN (%u,%u,%u,%u)"
|
||||||
") AS sizes",
|
") AS sizes",
|
||||||
(unsigned) Brw_ADMI_DOCUM_CRS,
|
(unsigned) Brw_ADMI_DOC_CRS,
|
||||||
(unsigned) Brw_ADMI_TEACH_CRS,
|
(unsigned) Brw_ADMI_TCH_CRS,
|
||||||
(unsigned) Brw_ADMI_SHARE_CRS,
|
(unsigned) Brw_ADMI_SHR_CRS,
|
||||||
(unsigned) Brw_ADMI_ASSIG_USR,
|
(unsigned) Brw_ADMI_ASG_USR,
|
||||||
(unsigned) Brw_ADMI_WORKS_USR,
|
(unsigned) Brw_ADMI_WRK_USR,
|
||||||
(unsigned) Brw_ADMI_MARKS_CRS,
|
(unsigned) Brw_ADMI_MRK_CRS,
|
||||||
(unsigned) Brw_ADMI_DOCUM_GRP,
|
(unsigned) Brw_ADMI_DOC_GRP,
|
||||||
(unsigned) Brw_ADMI_TEACH_GRP,
|
(unsigned) Brw_ADMI_TCH_GRP,
|
||||||
(unsigned) Brw_ADMI_SHARE_GRP,
|
(unsigned) Brw_ADMI_SHR_GRP,
|
||||||
(unsigned) Brw_ADMI_MARKS_GRP);
|
(unsigned) Brw_ADMI_MRK_GRP);
|
||||||
break;
|
break;
|
||||||
case Brw_ADMI_DOCUM_CRS:
|
case Brw_ADMI_DOC_CRS:
|
||||||
case Brw_ADMI_TEACH_CRS:
|
case Brw_ADMI_TCH_CRS:
|
||||||
case Brw_ADMI_SHARE_CRS:
|
case Brw_ADMI_SHR_CRS:
|
||||||
case Brw_ADMI_MARKS_CRS:
|
case Brw_ADMI_MRK_CRS:
|
||||||
sprintf (Query,"SELECT COUNT(DISTINCT Cod),"
|
sprintf (Query,"SELECT COUNT(DISTINCT Cod),"
|
||||||
"-1,"
|
"-1,"
|
||||||
"-1,"
|
"-1,"
|
||||||
|
@ -5795,10 +5795,10 @@ static void Sta_GetSizeOfFileZoneFromDB (Sco_Scope_t Scope,
|
||||||
" WHERE FileBrowser=%u",
|
" WHERE FileBrowser=%u",
|
||||||
(unsigned) FileBrowser);
|
(unsigned) FileBrowser);
|
||||||
break;
|
break;
|
||||||
case Brw_ADMI_DOCUM_GRP:
|
case Brw_ADMI_DOC_GRP:
|
||||||
case Brw_ADMI_TEACH_GRP:
|
case Brw_ADMI_TCH_GRP:
|
||||||
case Brw_ADMI_SHARE_GRP:
|
case Brw_ADMI_SHR_GRP:
|
||||||
case Brw_ADMI_MARKS_GRP:
|
case Brw_ADMI_MRK_GRP:
|
||||||
sprintf (Query,"SELECT COUNT(DISTINCT crs_grp_types.CrsCod),"
|
sprintf (Query,"SELECT COUNT(DISTINCT crs_grp_types.CrsCod),"
|
||||||
"COUNT(DISTINCT file_browser_size.Cod),"
|
"COUNT(DISTINCT file_browser_size.Cod),"
|
||||||
"-1,"
|
"-1,"
|
||||||
|
@ -5812,8 +5812,8 @@ static void Sta_GetSizeOfFileZoneFromDB (Sco_Scope_t Scope,
|
||||||
" AND file_browser_size.FileBrowser=%u",
|
" AND file_browser_size.FileBrowser=%u",
|
||||||
(unsigned) FileBrowser);
|
(unsigned) FileBrowser);
|
||||||
break;
|
break;
|
||||||
case Brw_ADMI_ASSIG_USR:
|
case Brw_ADMI_ASG_USR:
|
||||||
case Brw_ADMI_WORKS_USR:
|
case Brw_ADMI_WRK_USR:
|
||||||
sprintf (Query,"SELECT COUNT(DISTINCT Cod),"
|
sprintf (Query,"SELECT COUNT(DISTINCT Cod),"
|
||||||
"-1,"
|
"-1,"
|
||||||
"COUNT(DISTINCT ZoneUsrCod),"
|
"COUNT(DISTINCT ZoneUsrCod),"
|
||||||
|
@ -5825,7 +5825,7 @@ static void Sta_GetSizeOfFileZoneFromDB (Sco_Scope_t Scope,
|
||||||
" WHERE FileBrowser=%u",
|
" WHERE FileBrowser=%u",
|
||||||
(unsigned) FileBrowser);
|
(unsigned) FileBrowser);
|
||||||
break;
|
break;
|
||||||
case Brw_ADMI_BRIEF_USR:
|
case Brw_ADMI_BRF_USR:
|
||||||
sprintf (Query,"SELECT -1,"
|
sprintf (Query,"SELECT -1,"
|
||||||
"-1,"
|
"-1,"
|
||||||
"COUNT(DISTINCT ZoneUsrCod),"
|
"COUNT(DISTINCT ZoneUsrCod),"
|
||||||
|
@ -5887,22 +5887,22 @@ static void Sta_GetSizeOfFileZoneFromDB (Sco_Scope_t Scope,
|
||||||
" AND file_browser_size.FileBrowser IN (%u,%u,%u,%u)"
|
" AND file_browser_size.FileBrowser IN (%u,%u,%u,%u)"
|
||||||
") AS sizes",
|
") AS sizes",
|
||||||
Gbl.CurrentCty.Cty.CtyCod,
|
Gbl.CurrentCty.Cty.CtyCod,
|
||||||
(unsigned) Brw_ADMI_DOCUM_CRS,
|
(unsigned) Brw_ADMI_DOC_CRS,
|
||||||
(unsigned) Brw_ADMI_TEACH_CRS,
|
(unsigned) Brw_ADMI_TCH_CRS,
|
||||||
(unsigned) Brw_ADMI_SHARE_CRS,
|
(unsigned) Brw_ADMI_SHR_CRS,
|
||||||
(unsigned) Brw_ADMI_ASSIG_USR,
|
(unsigned) Brw_ADMI_ASG_USR,
|
||||||
(unsigned) Brw_ADMI_WORKS_USR,
|
(unsigned) Brw_ADMI_WRK_USR,
|
||||||
(unsigned) Brw_ADMI_MARKS_CRS,
|
(unsigned) Brw_ADMI_MRK_CRS,
|
||||||
Gbl.CurrentCty.Cty.CtyCod,
|
Gbl.CurrentCty.Cty.CtyCod,
|
||||||
(unsigned) Brw_ADMI_DOCUM_GRP,
|
(unsigned) Brw_ADMI_DOC_GRP,
|
||||||
(unsigned) Brw_ADMI_TEACH_GRP,
|
(unsigned) Brw_ADMI_TCH_GRP,
|
||||||
(unsigned) Brw_ADMI_SHARE_GRP,
|
(unsigned) Brw_ADMI_SHR_GRP,
|
||||||
(unsigned) Brw_ADMI_MARKS_GRP);
|
(unsigned) Brw_ADMI_MRK_GRP);
|
||||||
break;
|
break;
|
||||||
case Brw_ADMI_DOCUM_CRS:
|
case Brw_ADMI_DOC_CRS:
|
||||||
case Brw_ADMI_TEACH_CRS:
|
case Brw_ADMI_TCH_CRS:
|
||||||
case Brw_ADMI_SHARE_CRS:
|
case Brw_ADMI_SHR_CRS:
|
||||||
case Brw_ADMI_MARKS_CRS:
|
case Brw_ADMI_MRK_CRS:
|
||||||
sprintf (Query,"SELECT COUNT(DISTINCT file_browser_size.Cod),"
|
sprintf (Query,"SELECT COUNT(DISTINCT file_browser_size.Cod),"
|
||||||
"-1,"
|
"-1,"
|
||||||
"-1,"
|
"-1,"
|
||||||
|
@ -5919,10 +5919,10 @@ static void Sta_GetSizeOfFileZoneFromDB (Sco_Scope_t Scope,
|
||||||
" and file_browser_size.FileBrowser=%u",
|
" and file_browser_size.FileBrowser=%u",
|
||||||
Gbl.CurrentCty.Cty.CtyCod,(unsigned) FileBrowser);
|
Gbl.CurrentCty.Cty.CtyCod,(unsigned) FileBrowser);
|
||||||
break;
|
break;
|
||||||
case Brw_ADMI_DOCUM_GRP:
|
case Brw_ADMI_DOC_GRP:
|
||||||
case Brw_ADMI_TEACH_GRP:
|
case Brw_ADMI_TCH_GRP:
|
||||||
case Brw_ADMI_SHARE_GRP:
|
case Brw_ADMI_SHR_GRP:
|
||||||
case Brw_ADMI_MARKS_GRP:
|
case Brw_ADMI_MRK_GRP:
|
||||||
sprintf (Query,"SELECT COUNT(DISTINCT crs_grp_types.CrsCod),"
|
sprintf (Query,"SELECT COUNT(DISTINCT crs_grp_types.CrsCod),"
|
||||||
"COUNT(DISTINCT file_browser_size.Cod),"
|
"COUNT(DISTINCT file_browser_size.Cod),"
|
||||||
"-1,"
|
"-1,"
|
||||||
|
@ -5941,8 +5941,8 @@ static void Sta_GetSizeOfFileZoneFromDB (Sco_Scope_t Scope,
|
||||||
" AND file_browser_size.FileBrowser=%u",
|
" AND file_browser_size.FileBrowser=%u",
|
||||||
Gbl.CurrentCty.Cty.CtyCod,(unsigned) FileBrowser);
|
Gbl.CurrentCty.Cty.CtyCod,(unsigned) FileBrowser);
|
||||||
break;
|
break;
|
||||||
case Brw_ADMI_ASSIG_USR:
|
case Brw_ADMI_ASG_USR:
|
||||||
case Brw_ADMI_WORKS_USR:
|
case Brw_ADMI_WRK_USR:
|
||||||
sprintf (Query,"SELECT COUNT(DISTINCT file_browser_size.Cod),"
|
sprintf (Query,"SELECT COUNT(DISTINCT file_browser_size.Cod),"
|
||||||
"-1,"
|
"-1,"
|
||||||
"COUNT(DISTINCT file_browser_size.ZoneUsrCod),"
|
"COUNT(DISTINCT file_browser_size.ZoneUsrCod),"
|
||||||
|
@ -5959,7 +5959,7 @@ static void Sta_GetSizeOfFileZoneFromDB (Sco_Scope_t Scope,
|
||||||
" AND file_browser_size.FileBrowser=%u",
|
" AND file_browser_size.FileBrowser=%u",
|
||||||
Gbl.CurrentCty.Cty.CtyCod,(unsigned) FileBrowser);
|
Gbl.CurrentCty.Cty.CtyCod,(unsigned) FileBrowser);
|
||||||
break;
|
break;
|
||||||
case Brw_ADMI_BRIEF_USR:
|
case Brw_ADMI_BRF_USR:
|
||||||
sprintf (Query,"SELECT -1,"
|
sprintf (Query,"SELECT -1,"
|
||||||
"-1,"
|
"-1,"
|
||||||
"COUNT(DISTINCT file_browser_size.ZoneUsrCod),"
|
"COUNT(DISTINCT file_browser_size.ZoneUsrCod),"
|
||||||
|
@ -6025,22 +6025,22 @@ static void Sta_GetSizeOfFileZoneFromDB (Sco_Scope_t Scope,
|
||||||
" AND file_browser_size.FileBrowser IN (%u,%u,%u,%u)"
|
" AND file_browser_size.FileBrowser IN (%u,%u,%u,%u)"
|
||||||
") AS sizes",
|
") AS sizes",
|
||||||
Gbl.CurrentIns.Ins.InsCod,
|
Gbl.CurrentIns.Ins.InsCod,
|
||||||
(unsigned) Brw_ADMI_DOCUM_CRS,
|
(unsigned) Brw_ADMI_DOC_CRS,
|
||||||
(unsigned) Brw_ADMI_TEACH_CRS,
|
(unsigned) Brw_ADMI_TCH_CRS,
|
||||||
(unsigned) Brw_ADMI_SHARE_CRS,
|
(unsigned) Brw_ADMI_SHR_CRS,
|
||||||
(unsigned) Brw_ADMI_ASSIG_USR,
|
(unsigned) Brw_ADMI_ASG_USR,
|
||||||
(unsigned) Brw_ADMI_WORKS_USR,
|
(unsigned) Brw_ADMI_WRK_USR,
|
||||||
(unsigned) Brw_ADMI_MARKS_CRS,
|
(unsigned) Brw_ADMI_MRK_CRS,
|
||||||
Gbl.CurrentIns.Ins.InsCod,
|
Gbl.CurrentIns.Ins.InsCod,
|
||||||
(unsigned) Brw_ADMI_DOCUM_GRP,
|
(unsigned) Brw_ADMI_DOC_GRP,
|
||||||
(unsigned) Brw_ADMI_TEACH_GRP,
|
(unsigned) Brw_ADMI_TCH_GRP,
|
||||||
(unsigned) Brw_ADMI_SHARE_GRP,
|
(unsigned) Brw_ADMI_SHR_GRP,
|
||||||
(unsigned) Brw_ADMI_MARKS_GRP);
|
(unsigned) Brw_ADMI_MRK_GRP);
|
||||||
break;
|
break;
|
||||||
case Brw_ADMI_DOCUM_CRS:
|
case Brw_ADMI_DOC_CRS:
|
||||||
case Brw_ADMI_TEACH_CRS:
|
case Brw_ADMI_TCH_CRS:
|
||||||
case Brw_ADMI_SHARE_CRS:
|
case Brw_ADMI_SHR_CRS:
|
||||||
case Brw_ADMI_MARKS_CRS:
|
case Brw_ADMI_MRK_CRS:
|
||||||
sprintf (Query,"SELECT COUNT(DISTINCT file_browser_size.Cod),"
|
sprintf (Query,"SELECT COUNT(DISTINCT file_browser_size.Cod),"
|
||||||
"-1,"
|
"-1,"
|
||||||
"-1,"
|
"-1,"
|
||||||
|
@ -6056,10 +6056,10 @@ static void Sta_GetSizeOfFileZoneFromDB (Sco_Scope_t Scope,
|
||||||
" and file_browser_size.FileBrowser=%u",
|
" and file_browser_size.FileBrowser=%u",
|
||||||
Gbl.CurrentIns.Ins.InsCod,(unsigned) FileBrowser);
|
Gbl.CurrentIns.Ins.InsCod,(unsigned) FileBrowser);
|
||||||
break;
|
break;
|
||||||
case Brw_ADMI_DOCUM_GRP:
|
case Brw_ADMI_DOC_GRP:
|
||||||
case Brw_ADMI_TEACH_GRP:
|
case Brw_ADMI_TCH_GRP:
|
||||||
case Brw_ADMI_SHARE_GRP:
|
case Brw_ADMI_SHR_GRP:
|
||||||
case Brw_ADMI_MARKS_GRP:
|
case Brw_ADMI_MRK_GRP:
|
||||||
sprintf (Query,"SELECT COUNT(DISTINCT crs_grp_types.CrsCod),"
|
sprintf (Query,"SELECT COUNT(DISTINCT crs_grp_types.CrsCod),"
|
||||||
"COUNT(DISTINCT file_browser_size.Cod),"
|
"COUNT(DISTINCT file_browser_size.Cod),"
|
||||||
"-1,"
|
"-1,"
|
||||||
|
@ -6077,8 +6077,8 @@ static void Sta_GetSizeOfFileZoneFromDB (Sco_Scope_t Scope,
|
||||||
" AND file_browser_size.FileBrowser=%u",
|
" AND file_browser_size.FileBrowser=%u",
|
||||||
Gbl.CurrentIns.Ins.InsCod,(unsigned) FileBrowser);
|
Gbl.CurrentIns.Ins.InsCod,(unsigned) FileBrowser);
|
||||||
break;
|
break;
|
||||||
case Brw_ADMI_ASSIG_USR:
|
case Brw_ADMI_ASG_USR:
|
||||||
case Brw_ADMI_WORKS_USR:
|
case Brw_ADMI_WRK_USR:
|
||||||
sprintf (Query,"SELECT COUNT(DISTINCT file_browser_size.Cod),"
|
sprintf (Query,"SELECT COUNT(DISTINCT file_browser_size.Cod),"
|
||||||
"-1,"
|
"-1,"
|
||||||
"COUNT(DISTINCT file_browser_size.ZoneUsrCod),"
|
"COUNT(DISTINCT file_browser_size.ZoneUsrCod),"
|
||||||
|
@ -6094,7 +6094,7 @@ static void Sta_GetSizeOfFileZoneFromDB (Sco_Scope_t Scope,
|
||||||
" AND file_browser_size.FileBrowser=%u",
|
" AND file_browser_size.FileBrowser=%u",
|
||||||
Gbl.CurrentIns.Ins.InsCod,(unsigned) FileBrowser);
|
Gbl.CurrentIns.Ins.InsCod,(unsigned) FileBrowser);
|
||||||
break;
|
break;
|
||||||
case Brw_ADMI_BRIEF_USR:
|
case Brw_ADMI_BRF_USR:
|
||||||
sprintf (Query,"SELECT -1,"
|
sprintf (Query,"SELECT -1,"
|
||||||
"-1,"
|
"-1,"
|
||||||
"COUNT(DISTINCT file_browser_size.ZoneUsrCod),"
|
"COUNT(DISTINCT file_browser_size.ZoneUsrCod),"
|
||||||
|
@ -6157,22 +6157,22 @@ static void Sta_GetSizeOfFileZoneFromDB (Sco_Scope_t Scope,
|
||||||
" AND file_browser_size.FileBrowser IN (%u,%u,%u,%u)"
|
" AND file_browser_size.FileBrowser IN (%u,%u,%u,%u)"
|
||||||
") AS sizes",
|
") AS sizes",
|
||||||
Gbl.CurrentCtr.Ctr.CtrCod,
|
Gbl.CurrentCtr.Ctr.CtrCod,
|
||||||
(unsigned) Brw_ADMI_DOCUM_CRS,
|
(unsigned) Brw_ADMI_DOC_CRS,
|
||||||
(unsigned) Brw_ADMI_TEACH_CRS,
|
(unsigned) Brw_ADMI_TCH_CRS,
|
||||||
(unsigned) Brw_ADMI_SHARE_CRS,
|
(unsigned) Brw_ADMI_SHR_CRS,
|
||||||
(unsigned) Brw_ADMI_ASSIG_USR,
|
(unsigned) Brw_ADMI_ASG_USR,
|
||||||
(unsigned) Brw_ADMI_WORKS_USR,
|
(unsigned) Brw_ADMI_WRK_USR,
|
||||||
(unsigned) Brw_ADMI_MARKS_CRS,
|
(unsigned) Brw_ADMI_MRK_CRS,
|
||||||
Gbl.CurrentCtr.Ctr.CtrCod,
|
Gbl.CurrentCtr.Ctr.CtrCod,
|
||||||
(unsigned) Brw_ADMI_DOCUM_GRP,
|
(unsigned) Brw_ADMI_DOC_GRP,
|
||||||
(unsigned) Brw_ADMI_TEACH_GRP,
|
(unsigned) Brw_ADMI_TCH_GRP,
|
||||||
(unsigned) Brw_ADMI_SHARE_GRP,
|
(unsigned) Brw_ADMI_SHR_GRP,
|
||||||
(unsigned) Brw_ADMI_MARKS_GRP);
|
(unsigned) Brw_ADMI_MRK_GRP);
|
||||||
break;
|
break;
|
||||||
case Brw_ADMI_DOCUM_CRS:
|
case Brw_ADMI_DOC_CRS:
|
||||||
case Brw_ADMI_TEACH_CRS:
|
case Brw_ADMI_TCH_CRS:
|
||||||
case Brw_ADMI_SHARE_CRS:
|
case Brw_ADMI_SHR_CRS:
|
||||||
case Brw_ADMI_MARKS_CRS:
|
case Brw_ADMI_MRK_CRS:
|
||||||
sprintf (Query,"SELECT COUNT(DISTINCT file_browser_size.Cod),"
|
sprintf (Query,"SELECT COUNT(DISTINCT file_browser_size.Cod),"
|
||||||
"-1,"
|
"-1,"
|
||||||
"-1,"
|
"-1,"
|
||||||
|
@ -6187,10 +6187,10 @@ static void Sta_GetSizeOfFileZoneFromDB (Sco_Scope_t Scope,
|
||||||
" AND file_browser_size.FileBrowser=%u",
|
" AND file_browser_size.FileBrowser=%u",
|
||||||
Gbl.CurrentCtr.Ctr.CtrCod,(unsigned) FileBrowser);
|
Gbl.CurrentCtr.Ctr.CtrCod,(unsigned) FileBrowser);
|
||||||
break;
|
break;
|
||||||
case Brw_ADMI_DOCUM_GRP:
|
case Brw_ADMI_DOC_GRP:
|
||||||
case Brw_ADMI_TEACH_GRP:
|
case Brw_ADMI_TCH_GRP:
|
||||||
case Brw_ADMI_SHARE_GRP:
|
case Brw_ADMI_SHR_GRP:
|
||||||
case Brw_ADMI_MARKS_GRP:
|
case Brw_ADMI_MRK_GRP:
|
||||||
sprintf (Query,"SELECT COUNT(DISTINCT crs_grp_types.CrsCod),"
|
sprintf (Query,"SELECT COUNT(DISTINCT crs_grp_types.CrsCod),"
|
||||||
"COUNT(DISTINCT file_browser_size.Cod),"
|
"COUNT(DISTINCT file_browser_size.Cod),"
|
||||||
"-1,"
|
"-1,"
|
||||||
|
@ -6207,8 +6207,8 @@ static void Sta_GetSizeOfFileZoneFromDB (Sco_Scope_t Scope,
|
||||||
" AND file_browser_size.FileBrowser=%u",
|
" AND file_browser_size.FileBrowser=%u",
|
||||||
Gbl.CurrentCtr.Ctr.CtrCod,(unsigned) FileBrowser);
|
Gbl.CurrentCtr.Ctr.CtrCod,(unsigned) FileBrowser);
|
||||||
break;
|
break;
|
||||||
case Brw_ADMI_ASSIG_USR:
|
case Brw_ADMI_ASG_USR:
|
||||||
case Brw_ADMI_WORKS_USR:
|
case Brw_ADMI_WRK_USR:
|
||||||
sprintf (Query,"SELECT COUNT(DISTINCT file_browser_size.Cod),"
|
sprintf (Query,"SELECT COUNT(DISTINCT file_browser_size.Cod),"
|
||||||
"-1,"
|
"-1,"
|
||||||
"COUNT(DISTINCT file_browser_size.ZoneUsrCod),"
|
"COUNT(DISTINCT file_browser_size.ZoneUsrCod),"
|
||||||
|
@ -6223,7 +6223,7 @@ static void Sta_GetSizeOfFileZoneFromDB (Sco_Scope_t Scope,
|
||||||
" AND file_browser_size.FileBrowser=%u",
|
" AND file_browser_size.FileBrowser=%u",
|
||||||
Gbl.CurrentCtr.Ctr.CtrCod,(unsigned) FileBrowser);
|
Gbl.CurrentCtr.Ctr.CtrCod,(unsigned) FileBrowser);
|
||||||
break;
|
break;
|
||||||
case Brw_ADMI_BRIEF_USR:
|
case Brw_ADMI_BRF_USR:
|
||||||
sprintf (Query,"SELECT -1,"
|
sprintf (Query,"SELECT -1,"
|
||||||
"-1,"
|
"-1,"
|
||||||
"COUNT(DISTINCT file_browser_size.ZoneUsrCod),"
|
"COUNT(DISTINCT file_browser_size.ZoneUsrCod),"
|
||||||
|
@ -6283,22 +6283,22 @@ static void Sta_GetSizeOfFileZoneFromDB (Sco_Scope_t Scope,
|
||||||
" AND file_browser_size.FileBrowser IN (%u,%u,%u,%u)"
|
" AND file_browser_size.FileBrowser IN (%u,%u,%u,%u)"
|
||||||
") AS sizes",
|
") AS sizes",
|
||||||
Gbl.CurrentDeg.Deg.DegCod,
|
Gbl.CurrentDeg.Deg.DegCod,
|
||||||
(unsigned) Brw_ADMI_DOCUM_CRS,
|
(unsigned) Brw_ADMI_DOC_CRS,
|
||||||
(unsigned) Brw_ADMI_TEACH_CRS,
|
(unsigned) Brw_ADMI_TCH_CRS,
|
||||||
(unsigned) Brw_ADMI_SHARE_CRS,
|
(unsigned) Brw_ADMI_SHR_CRS,
|
||||||
(unsigned) Brw_ADMI_ASSIG_USR,
|
(unsigned) Brw_ADMI_ASG_USR,
|
||||||
(unsigned) Brw_ADMI_WORKS_USR,
|
(unsigned) Brw_ADMI_WRK_USR,
|
||||||
(unsigned) Brw_ADMI_MARKS_CRS,
|
(unsigned) Brw_ADMI_MRK_CRS,
|
||||||
Gbl.CurrentDeg.Deg.DegCod,
|
Gbl.CurrentDeg.Deg.DegCod,
|
||||||
(unsigned) Brw_ADMI_DOCUM_GRP,
|
(unsigned) Brw_ADMI_DOC_GRP,
|
||||||
(unsigned) Brw_ADMI_TEACH_GRP,
|
(unsigned) Brw_ADMI_TCH_GRP,
|
||||||
(unsigned) Brw_ADMI_SHARE_GRP,
|
(unsigned) Brw_ADMI_SHR_GRP,
|
||||||
(unsigned) Brw_ADMI_MARKS_GRP);
|
(unsigned) Brw_ADMI_MRK_GRP);
|
||||||
break;
|
break;
|
||||||
case Brw_ADMI_DOCUM_CRS:
|
case Brw_ADMI_DOC_CRS:
|
||||||
case Brw_ADMI_TEACH_CRS:
|
case Brw_ADMI_TCH_CRS:
|
||||||
case Brw_ADMI_SHARE_CRS:
|
case Brw_ADMI_SHR_CRS:
|
||||||
case Brw_ADMI_MARKS_CRS:
|
case Brw_ADMI_MRK_CRS:
|
||||||
sprintf (Query,"SELECT COUNT(DISTINCT file_browser_size.Cod),"
|
sprintf (Query,"SELECT COUNT(DISTINCT file_browser_size.Cod),"
|
||||||
"-1,"
|
"-1,"
|
||||||
"-1,"
|
"-1,"
|
||||||
|
@ -6312,10 +6312,10 @@ static void Sta_GetSizeOfFileZoneFromDB (Sco_Scope_t Scope,
|
||||||
" AND file_browser_size.FileBrowser=%u",
|
" AND file_browser_size.FileBrowser=%u",
|
||||||
Gbl.CurrentDeg.Deg.DegCod,(unsigned) FileBrowser);
|
Gbl.CurrentDeg.Deg.DegCod,(unsigned) FileBrowser);
|
||||||
break;
|
break;
|
||||||
case Brw_ADMI_DOCUM_GRP:
|
case Brw_ADMI_DOC_GRP:
|
||||||
case Brw_ADMI_TEACH_GRP:
|
case Brw_ADMI_TCH_GRP:
|
||||||
case Brw_ADMI_SHARE_GRP:
|
case Brw_ADMI_SHR_GRP:
|
||||||
case Brw_ADMI_MARKS_GRP:
|
case Brw_ADMI_MRK_GRP:
|
||||||
sprintf (Query,"SELECT COUNT(DISTINCT crs_grp_types.CrsCod),"
|
sprintf (Query,"SELECT COUNT(DISTINCT crs_grp_types.CrsCod),"
|
||||||
"COUNT(DISTINCT file_browser_size.Cod),"
|
"COUNT(DISTINCT file_browser_size.Cod),"
|
||||||
"-1,"
|
"-1,"
|
||||||
|
@ -6331,8 +6331,8 @@ static void Sta_GetSizeOfFileZoneFromDB (Sco_Scope_t Scope,
|
||||||
" AND file_browser_size.FileBrowser=%u",
|
" AND file_browser_size.FileBrowser=%u",
|
||||||
Gbl.CurrentDeg.Deg.DegCod,(unsigned) FileBrowser);
|
Gbl.CurrentDeg.Deg.DegCod,(unsigned) FileBrowser);
|
||||||
break;
|
break;
|
||||||
case Brw_ADMI_ASSIG_USR:
|
case Brw_ADMI_ASG_USR:
|
||||||
case Brw_ADMI_WORKS_USR:
|
case Brw_ADMI_WRK_USR:
|
||||||
sprintf (Query,"SELECT COUNT(DISTINCT file_browser_size.Cod),"
|
sprintf (Query,"SELECT COUNT(DISTINCT file_browser_size.Cod),"
|
||||||
"-1,"
|
"-1,"
|
||||||
"COUNT(DISTINCT file_browser_size.ZoneUsrCod),"
|
"COUNT(DISTINCT file_browser_size.ZoneUsrCod),"
|
||||||
|
@ -6346,7 +6346,7 @@ static void Sta_GetSizeOfFileZoneFromDB (Sco_Scope_t Scope,
|
||||||
" AND file_browser_size.FileBrowser=%u",
|
" AND file_browser_size.FileBrowser=%u",
|
||||||
Gbl.CurrentDeg.Deg.DegCod,(unsigned) FileBrowser);
|
Gbl.CurrentDeg.Deg.DegCod,(unsigned) FileBrowser);
|
||||||
break;
|
break;
|
||||||
case Brw_ADMI_BRIEF_USR:
|
case Brw_ADMI_BRF_USR:
|
||||||
sprintf (Query,"SELECT -1,"
|
sprintf (Query,"SELECT -1,"
|
||||||
"-1,"
|
"-1,"
|
||||||
"COUNT(DISTINCT file_browser_size.ZoneUsrCod),"
|
"COUNT(DISTINCT file_browser_size.ZoneUsrCod),"
|
||||||
|
@ -6403,22 +6403,22 @@ static void Sta_GetSizeOfFileZoneFromDB (Sco_Scope_t Scope,
|
||||||
" AND file_browser_size.FileBrowser IN (%u,%u,%u,%u)"
|
" AND file_browser_size.FileBrowser IN (%u,%u,%u,%u)"
|
||||||
") AS sizes",
|
") AS sizes",
|
||||||
Gbl.CurrentCrs.Crs.CrsCod,
|
Gbl.CurrentCrs.Crs.CrsCod,
|
||||||
(unsigned) Brw_ADMI_DOCUM_CRS,
|
(unsigned) Brw_ADMI_DOC_CRS,
|
||||||
(unsigned) Brw_ADMI_TEACH_CRS,
|
(unsigned) Brw_ADMI_TCH_CRS,
|
||||||
(unsigned) Brw_ADMI_SHARE_CRS,
|
(unsigned) Brw_ADMI_SHR_CRS,
|
||||||
(unsigned) Brw_ADMI_ASSIG_USR,
|
(unsigned) Brw_ADMI_ASG_USR,
|
||||||
(unsigned) Brw_ADMI_WORKS_USR,
|
(unsigned) Brw_ADMI_WRK_USR,
|
||||||
(unsigned) Brw_ADMI_MARKS_CRS,
|
(unsigned) Brw_ADMI_MRK_CRS,
|
||||||
Gbl.CurrentCrs.Crs.CrsCod,
|
Gbl.CurrentCrs.Crs.CrsCod,
|
||||||
(unsigned) Brw_ADMI_DOCUM_GRP,
|
(unsigned) Brw_ADMI_DOC_GRP,
|
||||||
(unsigned) Brw_ADMI_TEACH_GRP,
|
(unsigned) Brw_ADMI_TCH_GRP,
|
||||||
(unsigned) Brw_ADMI_SHARE_GRP,
|
(unsigned) Brw_ADMI_SHR_GRP,
|
||||||
(unsigned) Brw_ADMI_MARKS_GRP);
|
(unsigned) Brw_ADMI_MRK_GRP);
|
||||||
break;
|
break;
|
||||||
case Brw_ADMI_DOCUM_CRS:
|
case Brw_ADMI_DOC_CRS:
|
||||||
case Brw_ADMI_TEACH_CRS:
|
case Brw_ADMI_TCH_CRS:
|
||||||
case Brw_ADMI_SHARE_CRS:
|
case Brw_ADMI_SHR_CRS:
|
||||||
case Brw_ADMI_MARKS_CRS:
|
case Brw_ADMI_MRK_CRS:
|
||||||
sprintf (Query,"SELECT 1,"
|
sprintf (Query,"SELECT 1,"
|
||||||
"-1,"
|
"-1,"
|
||||||
"-1,"
|
"-1,"
|
||||||
|
@ -6430,10 +6430,10 @@ static void Sta_GetSizeOfFileZoneFromDB (Sco_Scope_t Scope,
|
||||||
" WHERE Cod=%ld AND FileBrowser=%u",
|
" WHERE Cod=%ld AND FileBrowser=%u",
|
||||||
Gbl.CurrentCrs.Crs.CrsCod,(unsigned) FileBrowser);
|
Gbl.CurrentCrs.Crs.CrsCod,(unsigned) FileBrowser);
|
||||||
break;
|
break;
|
||||||
case Brw_ADMI_DOCUM_GRP:
|
case Brw_ADMI_DOC_GRP:
|
||||||
case Brw_ADMI_TEACH_GRP:
|
case Brw_ADMI_TCH_GRP:
|
||||||
case Brw_ADMI_SHARE_GRP:
|
case Brw_ADMI_SHR_GRP:
|
||||||
case Brw_ADMI_MARKS_GRP:
|
case Brw_ADMI_MRK_GRP:
|
||||||
sprintf (Query,"SELECT COUNT(DISTINCT crs_grp_types.CrsCod),"
|
sprintf (Query,"SELECT COUNT(DISTINCT crs_grp_types.CrsCod),"
|
||||||
"COUNT(DISTINCT file_browser_size.Cod),"
|
"COUNT(DISTINCT file_browser_size.Cod),"
|
||||||
"-1,"
|
"-1,"
|
||||||
|
@ -6448,8 +6448,8 @@ static void Sta_GetSizeOfFileZoneFromDB (Sco_Scope_t Scope,
|
||||||
" AND file_browser_size.FileBrowser=%u",
|
" AND file_browser_size.FileBrowser=%u",
|
||||||
Gbl.CurrentCrs.Crs.CrsCod,(unsigned) FileBrowser);
|
Gbl.CurrentCrs.Crs.CrsCod,(unsigned) FileBrowser);
|
||||||
break;
|
break;
|
||||||
case Brw_ADMI_ASSIG_USR:
|
case Brw_ADMI_ASG_USR:
|
||||||
case Brw_ADMI_WORKS_USR:
|
case Brw_ADMI_WRK_USR:
|
||||||
sprintf (Query,"SELECT 1,"
|
sprintf (Query,"SELECT 1,"
|
||||||
"-1,"
|
"-1,"
|
||||||
"COUNT(DISTINCT ZoneUsrCod),"
|
"COUNT(DISTINCT ZoneUsrCod),"
|
||||||
|
@ -6461,7 +6461,7 @@ static void Sta_GetSizeOfFileZoneFromDB (Sco_Scope_t Scope,
|
||||||
" WHERE Cod=%ld AND FileBrowser=%u",
|
" WHERE Cod=%ld AND FileBrowser=%u",
|
||||||
Gbl.CurrentCrs.Crs.CrsCod,(unsigned) FileBrowser);
|
Gbl.CurrentCrs.Crs.CrsCod,(unsigned) FileBrowser);
|
||||||
break;
|
break;
|
||||||
case Brw_ADMI_BRIEF_USR:
|
case Brw_ADMI_BRF_USR:
|
||||||
sprintf (Query,"SELECT -1,"
|
sprintf (Query,"SELECT -1,"
|
||||||
"-1,"
|
"-1,"
|
||||||
"COUNT(DISTINCT file_browser_size.ZoneUsrCod),"
|
"COUNT(DISTINCT file_browser_size.ZoneUsrCod),"
|
||||||
|
@ -6629,8 +6629,8 @@ static void Sta_GetNumberOfOERsFromDB (Sco_Scope_t Scope,Brw_License_t License,u
|
||||||
" AND files.License=%u"
|
" AND files.License=%u"
|
||||||
" GROUP BY files.Public",
|
" GROUP BY files.Public",
|
||||||
Gbl.CurrentCty.Cty.CtyCod,
|
Gbl.CurrentCty.Cty.CtyCod,
|
||||||
(unsigned) Brw_ADMI_DOCUM_CRS,
|
(unsigned) Brw_ADMI_DOC_CRS,
|
||||||
(unsigned) Brw_ADMI_SHARE_CRS,
|
(unsigned) Brw_ADMI_SHR_CRS,
|
||||||
(unsigned) License);
|
(unsigned) License);
|
||||||
break;
|
break;
|
||||||
case Sco_SCOPE_INS:
|
case Sco_SCOPE_INS:
|
||||||
|
@ -6644,8 +6644,8 @@ static void Sta_GetNumberOfOERsFromDB (Sco_Scope_t Scope,Brw_License_t License,u
|
||||||
" AND files.License=%u"
|
" AND files.License=%u"
|
||||||
" GROUP BY files.Public",
|
" GROUP BY files.Public",
|
||||||
Gbl.CurrentIns.Ins.InsCod,
|
Gbl.CurrentIns.Ins.InsCod,
|
||||||
(unsigned) Brw_ADMI_DOCUM_CRS,
|
(unsigned) Brw_ADMI_DOC_CRS,
|
||||||
(unsigned) Brw_ADMI_SHARE_CRS,
|
(unsigned) Brw_ADMI_SHR_CRS,
|
||||||
(unsigned) License);
|
(unsigned) License);
|
||||||
break;
|
break;
|
||||||
case Sco_SCOPE_CTR:
|
case Sco_SCOPE_CTR:
|
||||||
|
@ -6658,8 +6658,8 @@ static void Sta_GetNumberOfOERsFromDB (Sco_Scope_t Scope,Brw_License_t License,u
|
||||||
" AND files.License=%u"
|
" AND files.License=%u"
|
||||||
" GROUP BY files.Public",
|
" GROUP BY files.Public",
|
||||||
Gbl.CurrentCtr.Ctr.CtrCod,
|
Gbl.CurrentCtr.Ctr.CtrCod,
|
||||||
(unsigned) Brw_ADMI_DOCUM_CRS,
|
(unsigned) Brw_ADMI_DOC_CRS,
|
||||||
(unsigned) Brw_ADMI_SHARE_CRS,
|
(unsigned) Brw_ADMI_SHR_CRS,
|
||||||
(unsigned) License);
|
(unsigned) License);
|
||||||
break;
|
break;
|
||||||
case Sco_SCOPE_DEG:
|
case Sco_SCOPE_DEG:
|
||||||
|
@ -6671,8 +6671,8 @@ static void Sta_GetNumberOfOERsFromDB (Sco_Scope_t Scope,Brw_License_t License,u
|
||||||
" AND files.License=%u"
|
" AND files.License=%u"
|
||||||
" GROUP BY files.Public",
|
" GROUP BY files.Public",
|
||||||
Gbl.CurrentDeg.Deg.DegCod,
|
Gbl.CurrentDeg.Deg.DegCod,
|
||||||
(unsigned) Brw_ADMI_DOCUM_CRS,
|
(unsigned) Brw_ADMI_DOC_CRS,
|
||||||
(unsigned) Brw_ADMI_SHARE_CRS,
|
(unsigned) Brw_ADMI_SHR_CRS,
|
||||||
(unsigned) License);
|
(unsigned) License);
|
||||||
break;
|
break;
|
||||||
case Sco_SCOPE_CRS:
|
case Sco_SCOPE_CRS:
|
||||||
|
@ -6683,8 +6683,8 @@ static void Sta_GetNumberOfOERsFromDB (Sco_Scope_t Scope,Brw_License_t License,u
|
||||||
" AND License=%u"
|
" AND License=%u"
|
||||||
" GROUP BY Public",
|
" GROUP BY Public",
|
||||||
Gbl.CurrentCrs.Crs.CrsCod,
|
Gbl.CurrentCrs.Crs.CrsCod,
|
||||||
(unsigned) Brw_ADMI_DOCUM_CRS,
|
(unsigned) Brw_ADMI_DOC_CRS,
|
||||||
(unsigned) Brw_ADMI_SHARE_CRS,
|
(unsigned) Brw_ADMI_SHR_CRS,
|
||||||
(unsigned) License);
|
(unsigned) License);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
|
74
swad_text.c
74
swad_text.c
|
@ -37515,7 +37515,7 @@ const char *Txt_ROOT_FOLDER_EXTERNAL_NAMES[Brw_NUM_TYPES_FILE_BROWSER] =
|
||||||
{
|
{
|
||||||
// Brw_UNKNOWN
|
// Brw_UNKNOWN
|
||||||
"",
|
"",
|
||||||
// Brw_SHOW_DOCUM_CRS
|
// Brw_SHOW_DOC_CRS
|
||||||
#if L==1
|
#if L==1
|
||||||
"documents"
|
"documents"
|
||||||
#elif L==2
|
#elif L==2
|
||||||
|
@ -37536,7 +37536,7 @@ const char *Txt_ROOT_FOLDER_EXTERNAL_NAMES[Brw_NUM_TYPES_FILE_BROWSER] =
|
||||||
"documentos"
|
"documentos"
|
||||||
#endif
|
#endif
|
||||||
,
|
,
|
||||||
// Brw_SHOW_MARKS_CRS
|
// Brw_SHOW_MRK_CRS
|
||||||
#if L==1
|
#if L==1
|
||||||
"qualificacions"
|
"qualificacions"
|
||||||
#elif L==2
|
#elif L==2
|
||||||
|
@ -37557,7 +37557,7 @@ const char *Txt_ROOT_FOLDER_EXTERNAL_NAMES[Brw_NUM_TYPES_FILE_BROWSER] =
|
||||||
"notas"
|
"notas"
|
||||||
#endif
|
#endif
|
||||||
,
|
,
|
||||||
// Brw_ADMI_DOCUM_CRS
|
// Brw_ADMI_DOC_CRS
|
||||||
#if L==1
|
#if L==1
|
||||||
"documents"
|
"documents"
|
||||||
#elif L==2
|
#elif L==2
|
||||||
|
@ -37578,7 +37578,7 @@ const char *Txt_ROOT_FOLDER_EXTERNAL_NAMES[Brw_NUM_TYPES_FILE_BROWSER] =
|
||||||
"documentos"
|
"documentos"
|
||||||
#endif
|
#endif
|
||||||
,
|
,
|
||||||
// Brw_ADMI_SHARE_CRS
|
// Brw_ADMI_SHR_CRS
|
||||||
#if L==1
|
#if L==1
|
||||||
"compartits"
|
"compartits"
|
||||||
#elif L==2
|
#elif L==2
|
||||||
|
@ -37599,7 +37599,7 @@ const char *Txt_ROOT_FOLDER_EXTERNAL_NAMES[Brw_NUM_TYPES_FILE_BROWSER] =
|
||||||
"comum"
|
"comum"
|
||||||
#endif
|
#endif
|
||||||
,
|
,
|
||||||
// Brw_ADMI_SHARE_GRP
|
// Brw_ADMI_SHR_GRP
|
||||||
#if L==1
|
#if L==1
|
||||||
"compartits"
|
"compartits"
|
||||||
#elif L==2
|
#elif L==2
|
||||||
|
@ -37620,7 +37620,7 @@ const char *Txt_ROOT_FOLDER_EXTERNAL_NAMES[Brw_NUM_TYPES_FILE_BROWSER] =
|
||||||
"comum"
|
"comum"
|
||||||
#endif
|
#endif
|
||||||
,
|
,
|
||||||
// Brw_ADMI_WORKS_USR
|
// Brw_ADMI_WRK_USR
|
||||||
#if L==1
|
#if L==1
|
||||||
"treballs"
|
"treballs"
|
||||||
#elif L==2
|
#elif L==2
|
||||||
|
@ -37641,7 +37641,7 @@ const char *Txt_ROOT_FOLDER_EXTERNAL_NAMES[Brw_NUM_TYPES_FILE_BROWSER] =
|
||||||
"trabalhos"
|
"trabalhos"
|
||||||
#endif
|
#endif
|
||||||
,
|
,
|
||||||
// Brw_ADMI_WORKS_CRS
|
// Brw_ADMI_WRK_CRS
|
||||||
#if L==1
|
#if L==1
|
||||||
"treballs"
|
"treballs"
|
||||||
#elif L==2
|
#elif L==2
|
||||||
|
@ -37662,7 +37662,7 @@ const char *Txt_ROOT_FOLDER_EXTERNAL_NAMES[Brw_NUM_TYPES_FILE_BROWSER] =
|
||||||
"trabalhos"
|
"trabalhos"
|
||||||
#endif
|
#endif
|
||||||
,
|
,
|
||||||
// Brw_ADMI_MARKS_CRS
|
// Brw_ADMI_MRK_CRS
|
||||||
#if L==1
|
#if L==1
|
||||||
"qualificacions"
|
"qualificacions"
|
||||||
#elif L==2
|
#elif L==2
|
||||||
|
@ -37683,7 +37683,7 @@ const char *Txt_ROOT_FOLDER_EXTERNAL_NAMES[Brw_NUM_TYPES_FILE_BROWSER] =
|
||||||
"notas"
|
"notas"
|
||||||
#endif
|
#endif
|
||||||
,
|
,
|
||||||
// Brw_ADMI_BRIEF_USR
|
// Brw_ADMI_BRF_USR
|
||||||
#if L==1
|
#if L==1
|
||||||
"maleti"
|
"maleti"
|
||||||
#elif L==2
|
#elif L==2
|
||||||
|
@ -37704,7 +37704,7 @@ const char *Txt_ROOT_FOLDER_EXTERNAL_NAMES[Brw_NUM_TYPES_FILE_BROWSER] =
|
||||||
"pasta"
|
"pasta"
|
||||||
#endif
|
#endif
|
||||||
,
|
,
|
||||||
// Brw_SHOW_DOCUM_GRP
|
// Brw_SHOW_DOC_GRP
|
||||||
#if L==1
|
#if L==1
|
||||||
"documents"
|
"documents"
|
||||||
#elif L==2
|
#elif L==2
|
||||||
|
@ -37725,7 +37725,7 @@ const char *Txt_ROOT_FOLDER_EXTERNAL_NAMES[Brw_NUM_TYPES_FILE_BROWSER] =
|
||||||
"documentos"
|
"documentos"
|
||||||
#endif
|
#endif
|
||||||
,
|
,
|
||||||
// Brw_ADMI_DOCUM_GRP
|
// Brw_ADMI_DOC_GRP
|
||||||
#if L==1
|
#if L==1
|
||||||
"documents"
|
"documents"
|
||||||
#elif L==2
|
#elif L==2
|
||||||
|
@ -37746,7 +37746,7 @@ const char *Txt_ROOT_FOLDER_EXTERNAL_NAMES[Brw_NUM_TYPES_FILE_BROWSER] =
|
||||||
"documentos"
|
"documentos"
|
||||||
#endif
|
#endif
|
||||||
,
|
,
|
||||||
// Brw_SHOW_MARKS_GRP
|
// Brw_SHOW_MRK_GRP
|
||||||
#if L==1
|
#if L==1
|
||||||
"qualificacions" // Necessita traduccio
|
"qualificacions" // Necessita traduccio
|
||||||
#elif L==2
|
#elif L==2
|
||||||
|
@ -37767,7 +37767,7 @@ const char *Txt_ROOT_FOLDER_EXTERNAL_NAMES[Brw_NUM_TYPES_FILE_BROWSER] =
|
||||||
"notas"
|
"notas"
|
||||||
#endif
|
#endif
|
||||||
,
|
,
|
||||||
// Brw_ADMI_MARKS_GRP
|
// Brw_ADMI_MRK_GRP
|
||||||
#if L==1
|
#if L==1
|
||||||
"qualificacions"
|
"qualificacions"
|
||||||
#elif L==2
|
#elif L==2
|
||||||
|
@ -37788,7 +37788,7 @@ const char *Txt_ROOT_FOLDER_EXTERNAL_NAMES[Brw_NUM_TYPES_FILE_BROWSER] =
|
||||||
"notas"
|
"notas"
|
||||||
#endif
|
#endif
|
||||||
,
|
,
|
||||||
// Brw_ADMI_ASSIG_USR
|
// Brw_ADMI_ASG_USR
|
||||||
#if L==1
|
#if L==1
|
||||||
"activitats"
|
"activitats"
|
||||||
#elif L==2
|
#elif L==2
|
||||||
|
@ -37809,7 +37809,7 @@ const char *Txt_ROOT_FOLDER_EXTERNAL_NAMES[Brw_NUM_TYPES_FILE_BROWSER] =
|
||||||
"atividades"
|
"atividades"
|
||||||
#endif
|
#endif
|
||||||
,
|
,
|
||||||
// Brw_ADMI_ASSIG_CRS
|
// Brw_ADMI_ASG_CRS
|
||||||
#if L==1
|
#if L==1
|
||||||
"activitats"
|
"activitats"
|
||||||
#elif L==2
|
#elif L==2
|
||||||
|
@ -37830,7 +37830,7 @@ const char *Txt_ROOT_FOLDER_EXTERNAL_NAMES[Brw_NUM_TYPES_FILE_BROWSER] =
|
||||||
"atividades"
|
"atividades"
|
||||||
#endif
|
#endif
|
||||||
,
|
,
|
||||||
// Brw_SHOW_DOCUM_DEG
|
// Brw_SHOW_DOC_DEG
|
||||||
#if L==1
|
#if L==1
|
||||||
"documents"
|
"documents"
|
||||||
#elif L==2
|
#elif L==2
|
||||||
|
@ -37851,7 +37851,7 @@ const char *Txt_ROOT_FOLDER_EXTERNAL_NAMES[Brw_NUM_TYPES_FILE_BROWSER] =
|
||||||
"documentos"
|
"documentos"
|
||||||
#endif
|
#endif
|
||||||
,
|
,
|
||||||
// Brw_ADMI_DOCUM_DEG
|
// Brw_ADMI_DOC_DEG
|
||||||
#if L==1
|
#if L==1
|
||||||
"documents"
|
"documents"
|
||||||
#elif L==2
|
#elif L==2
|
||||||
|
@ -37872,7 +37872,7 @@ const char *Txt_ROOT_FOLDER_EXTERNAL_NAMES[Brw_NUM_TYPES_FILE_BROWSER] =
|
||||||
"documentos"
|
"documentos"
|
||||||
#endif
|
#endif
|
||||||
,
|
,
|
||||||
// Brw_SHOW_DOCUM_CTR
|
// Brw_SHOW_DOC_CTR
|
||||||
#if L==1
|
#if L==1
|
||||||
"documents"
|
"documents"
|
||||||
#elif L==2
|
#elif L==2
|
||||||
|
@ -37893,7 +37893,7 @@ const char *Txt_ROOT_FOLDER_EXTERNAL_NAMES[Brw_NUM_TYPES_FILE_BROWSER] =
|
||||||
"documentos"
|
"documentos"
|
||||||
#endif
|
#endif
|
||||||
,
|
,
|
||||||
// Brw_ADMI_DOCUM_CTR
|
// Brw_ADMI_DOC_CTR
|
||||||
#if L==1
|
#if L==1
|
||||||
"documents"
|
"documents"
|
||||||
#elif L==2
|
#elif L==2
|
||||||
|
@ -37914,7 +37914,7 @@ const char *Txt_ROOT_FOLDER_EXTERNAL_NAMES[Brw_NUM_TYPES_FILE_BROWSER] =
|
||||||
"documentos"
|
"documentos"
|
||||||
#endif
|
#endif
|
||||||
,
|
,
|
||||||
// Brw_SHOW_DOCUM_INS
|
// Brw_SHOW_DOC_INS
|
||||||
#if L==1
|
#if L==1
|
||||||
"documents"
|
"documents"
|
||||||
#elif L==2
|
#elif L==2
|
||||||
|
@ -37935,7 +37935,7 @@ const char *Txt_ROOT_FOLDER_EXTERNAL_NAMES[Brw_NUM_TYPES_FILE_BROWSER] =
|
||||||
"documentos"
|
"documentos"
|
||||||
#endif
|
#endif
|
||||||
,
|
,
|
||||||
// Brw_ADMI_DOCUM_INS
|
// Brw_ADMI_DOC_INS
|
||||||
#if L==1
|
#if L==1
|
||||||
"documents"
|
"documents"
|
||||||
#elif L==2
|
#elif L==2
|
||||||
|
@ -37956,7 +37956,7 @@ const char *Txt_ROOT_FOLDER_EXTERNAL_NAMES[Brw_NUM_TYPES_FILE_BROWSER] =
|
||||||
"documentos"
|
"documentos"
|
||||||
#endif
|
#endif
|
||||||
,
|
,
|
||||||
// Brw_ADMI_SHARE_DEG
|
// Brw_ADMI_SHR_DEG
|
||||||
#if L==1
|
#if L==1
|
||||||
"compartits"
|
"compartits"
|
||||||
#elif L==2
|
#elif L==2
|
||||||
|
@ -37977,7 +37977,7 @@ const char *Txt_ROOT_FOLDER_EXTERNAL_NAMES[Brw_NUM_TYPES_FILE_BROWSER] =
|
||||||
"comum"
|
"comum"
|
||||||
#endif
|
#endif
|
||||||
,
|
,
|
||||||
// Brw_ADMI_SHARE_CTR
|
// Brw_ADMI_SHR_CTR
|
||||||
#if L==1
|
#if L==1
|
||||||
"compartits"
|
"compartits"
|
||||||
#elif L==2
|
#elif L==2
|
||||||
|
@ -37998,7 +37998,7 @@ const char *Txt_ROOT_FOLDER_EXTERNAL_NAMES[Brw_NUM_TYPES_FILE_BROWSER] =
|
||||||
"comum"
|
"comum"
|
||||||
#endif
|
#endif
|
||||||
,
|
,
|
||||||
// Brw_ADMI_SHARE_INS
|
// Brw_ADMI_SHR_INS
|
||||||
#if L==1
|
#if L==1
|
||||||
"compartits"
|
"compartits"
|
||||||
#elif L==2
|
#elif L==2
|
||||||
|
@ -38019,7 +38019,7 @@ const char *Txt_ROOT_FOLDER_EXTERNAL_NAMES[Brw_NUM_TYPES_FILE_BROWSER] =
|
||||||
"comum"
|
"comum"
|
||||||
#endif
|
#endif
|
||||||
,
|
,
|
||||||
// Brw_ADMI_TEACH_CRS
|
// Brw_ADMI_TCH_CRS
|
||||||
#if L==1
|
#if L==1
|
||||||
"privats"
|
"privats"
|
||||||
#elif L==2
|
#elif L==2
|
||||||
|
@ -38040,7 +38040,7 @@ const char *Txt_ROOT_FOLDER_EXTERNAL_NAMES[Brw_NUM_TYPES_FILE_BROWSER] =
|
||||||
"privados"
|
"privados"
|
||||||
#endif
|
#endif
|
||||||
,
|
,
|
||||||
// Brw_ADMI_TEACH_GRP
|
// Brw_ADMI_TCH_GRP
|
||||||
#if L==1
|
#if L==1
|
||||||
"privats"
|
"privats"
|
||||||
#elif L==2
|
#elif L==2
|
||||||
|
@ -38061,7 +38061,7 @@ const char *Txt_ROOT_FOLDER_EXTERNAL_NAMES[Brw_NUM_TYPES_FILE_BROWSER] =
|
||||||
"privados"
|
"privados"
|
||||||
#endif
|
#endif
|
||||||
,
|
,
|
||||||
// Brw_ADMI_DOCUM_PRJ
|
// Brw_ADMI_DOC_PRJ
|
||||||
#if L==1
|
#if L==1
|
||||||
"projecte"
|
"projecte"
|
||||||
#elif L==2
|
#elif L==2
|
||||||
|
@ -40988,7 +40988,7 @@ const char *Txt_STAT_COLOR_TYPES[Sta_NUM_COLOR_TYPES] =
|
||||||
|
|
||||||
const char *Txt_STAT_COURSE_FILE_ZONES[Sta_NUM_STAT_CRS_FILE_ZONES] = // Use instead of space
|
const char *Txt_STAT_COURSE_FILE_ZONES[Sta_NUM_STAT_CRS_FILE_ZONES] = // Use instead of space
|
||||||
{
|
{
|
||||||
#if L==1 // Brw_ADMI_DOCUM_CRS
|
#if L==1 // Brw_ADMI_DOC_CRS
|
||||||
"Documents (ass.)"
|
"Documents (ass.)"
|
||||||
#elif L==2
|
#elif L==2
|
||||||
"Dokumente (Ver.)"
|
"Dokumente (Ver.)"
|
||||||
|
@ -41008,7 +41008,7 @@ const char *Txt_STAT_COURSE_FILE_ZONES[Sta_NUM_STAT_CRS_FILE_ZONES] = // Use &nb
|
||||||
"Documentos (crs.)"
|
"Documentos (crs.)"
|
||||||
#endif
|
#endif
|
||||||
,
|
,
|
||||||
#if L==1 // Brw_ADMI_DOCUM_GRP
|
#if L==1 // Brw_ADMI_DOC_GRP
|
||||||
"Documents (grp.)"
|
"Documents (grp.)"
|
||||||
#elif L==2
|
#elif L==2
|
||||||
"Dokumente (Grp.)"
|
"Dokumente (Grp.)"
|
||||||
|
@ -41028,7 +41028,7 @@ const char *Txt_STAT_COURSE_FILE_ZONES[Sta_NUM_STAT_CRS_FILE_ZONES] = // Use &nb
|
||||||
"Documentos (grp.)"
|
"Documentos (grp.)"
|
||||||
#endif
|
#endif
|
||||||
,
|
,
|
||||||
#if L==1 // Brw_ADMI_TEACH_CRS
|
#if L==1 // Brw_ADMI_TCH_CRS
|
||||||
"Privats (ass.)"
|
"Privats (ass.)"
|
||||||
#elif L==2
|
#elif L==2
|
||||||
"Private (Ver.)"
|
"Private (Ver.)"
|
||||||
|
@ -41048,7 +41048,7 @@ const char *Txt_STAT_COURSE_FILE_ZONES[Sta_NUM_STAT_CRS_FILE_ZONES] = // Use &nb
|
||||||
"Privadoss (crs.)"
|
"Privadoss (crs.)"
|
||||||
#endif
|
#endif
|
||||||
,
|
,
|
||||||
#if L==1 // Brw_ADMI_TEACH_GRP
|
#if L==1 // Brw_ADMI_TCH_GRP
|
||||||
"Privats (grp.)"
|
"Privats (grp.)"
|
||||||
#elif L==2
|
#elif L==2
|
||||||
"Private (Grp.)"
|
"Private (Grp.)"
|
||||||
|
@ -41068,7 +41068,7 @@ const char *Txt_STAT_COURSE_FILE_ZONES[Sta_NUM_STAT_CRS_FILE_ZONES] = // Use &nb
|
||||||
"Privadoss (grp.)"
|
"Privadoss (grp.)"
|
||||||
#endif
|
#endif
|
||||||
,
|
,
|
||||||
#if L==1 // Brw_ADMI_SHARE_CRS
|
#if L==1 // Brw_ADMI_SHR_CRS
|
||||||
"Compartits (asg.)"
|
"Compartits (asg.)"
|
||||||
#elif L==2
|
#elif L==2
|
||||||
"Freigegebene (Ver.)"
|
"Freigegebene (Ver.)"
|
||||||
|
@ -41088,7 +41088,7 @@ const char *Txt_STAT_COURSE_FILE_ZONES[Sta_NUM_STAT_CRS_FILE_ZONES] = // Use &nb
|
||||||
"Compartilhados (crs.)"
|
"Compartilhados (crs.)"
|
||||||
#endif
|
#endif
|
||||||
,
|
,
|
||||||
#if L==1 // Brw_ADMI_SHARE_GRP
|
#if L==1 // Brw_ADMI_SHR_GRP
|
||||||
"Compartits (grp.)"
|
"Compartits (grp.)"
|
||||||
#elif L==2
|
#elif L==2
|
||||||
"Freigegebene (Grp.)"
|
"Freigegebene (Grp.)"
|
||||||
|
@ -41108,7 +41108,7 @@ const char *Txt_STAT_COURSE_FILE_ZONES[Sta_NUM_STAT_CRS_FILE_ZONES] = // Use &nb
|
||||||
"Compartilhados (grp.)"
|
"Compartilhados (grp.)"
|
||||||
#endif
|
#endif
|
||||||
,
|
,
|
||||||
#if L==1 // Brw_ADMI_MARKS_CRS
|
#if L==1 // Brw_ADMI_MRK_CRS
|
||||||
"Qualificacions (ass.)"
|
"Qualificacions (ass.)"
|
||||||
#elif L==2
|
#elif L==2
|
||||||
"Bewertungen (Ver.)"
|
"Bewertungen (Ver.)"
|
||||||
|
@ -41128,7 +41128,7 @@ const char *Txt_STAT_COURSE_FILE_ZONES[Sta_NUM_STAT_CRS_FILE_ZONES] = // Use &nb
|
||||||
"Notas (crs.)"
|
"Notas (crs.)"
|
||||||
#endif
|
#endif
|
||||||
,
|
,
|
||||||
#if L==1 // Brw_ADMI_MARKS_GRP
|
#if L==1 // Brw_ADMI_MRK_GRP
|
||||||
"Qualificacions (grp.)"
|
"Qualificacions (grp.)"
|
||||||
#elif L==2
|
#elif L==2
|
||||||
"Bewertungen (Grp.)"
|
"Bewertungen (Grp.)"
|
||||||
|
@ -41148,7 +41148,7 @@ const char *Txt_STAT_COURSE_FILE_ZONES[Sta_NUM_STAT_CRS_FILE_ZONES] = // Use &nb
|
||||||
"Notas (grp.)"
|
"Notas (grp.)"
|
||||||
#endif
|
#endif
|
||||||
,
|
,
|
||||||
#if L==1 // Brw_ADMI_ASSIG_USR
|
#if L==1 // Brw_ADMI_ASG_USR
|
||||||
"Activitats"
|
"Activitats"
|
||||||
#elif L==2
|
#elif L==2
|
||||||
"Aufgaben"
|
"Aufgaben"
|
||||||
|
@ -41168,7 +41168,7 @@ const char *Txt_STAT_COURSE_FILE_ZONES[Sta_NUM_STAT_CRS_FILE_ZONES] = // Use &nb
|
||||||
"Atividades"
|
"Atividades"
|
||||||
#endif
|
#endif
|
||||||
,
|
,
|
||||||
#if L==1 // Brw_ADMI_WORKS_USR
|
#if L==1 // Brw_ADMI_WRK_USR
|
||||||
"Treballs"
|
"Treballs"
|
||||||
#elif L==2
|
#elif L==2
|
||||||
"Hausarbeiten"
|
"Hausarbeiten"
|
||||||
|
|
|
@ -4341,26 +4341,26 @@ int swad__getDirectoryTree (struct soap *soap,
|
||||||
switch (treeCode)
|
switch (treeCode)
|
||||||
{
|
{
|
||||||
case 1: // Documents
|
case 1: // Documents
|
||||||
Gbl.FileBrowser.Type = Brw_SHOW_DOCUM_GRP;
|
Gbl.FileBrowser.Type = Brw_SHOW_DOC_GRP;
|
||||||
break;
|
break;
|
||||||
case 2: // Shared files
|
case 2: // Shared files
|
||||||
Gbl.FileBrowser.Type = Brw_ADMI_SHARE_GRP;
|
Gbl.FileBrowser.Type = Brw_ADMI_SHR_GRP;
|
||||||
break;
|
break;
|
||||||
case 3: // Marks
|
case 3: // Marks
|
||||||
Gbl.FileBrowser.Type = Brw_SHOW_MARKS_GRP;
|
Gbl.FileBrowser.Type = Brw_SHOW_MRK_GRP;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
else // groupCode <= 0
|
else // groupCode <= 0
|
||||||
switch (treeCode)
|
switch (treeCode)
|
||||||
{
|
{
|
||||||
case 1: // Documents
|
case 1: // Documents
|
||||||
Gbl.FileBrowser.Type = Brw_SHOW_DOCUM_CRS;
|
Gbl.FileBrowser.Type = Brw_SHOW_DOC_CRS;
|
||||||
break;
|
break;
|
||||||
case 2: // Shared files
|
case 2: // Shared files
|
||||||
Gbl.FileBrowser.Type = Brw_ADMI_SHARE_CRS;
|
Gbl.FileBrowser.Type = Brw_ADMI_SHR_CRS;
|
||||||
break;
|
break;
|
||||||
case 3: // Marks
|
case 3: // Marks
|
||||||
Gbl.FileBrowser.Type = Brw_SHOW_MARKS_CRS;
|
Gbl.FileBrowser.Type = Brw_SHOW_MRK_CRS;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -4493,8 +4493,8 @@ static bool Svc_WriteRowFileBrowser (unsigned Level,Brw_FileType_t FileType,cons
|
||||||
char PhotoURL[Cns_MAX_BYTES_WWW + 1];
|
char PhotoURL[Cns_MAX_BYTES_WWW + 1];
|
||||||
|
|
||||||
/***** Is this row hidden or visible? *****/
|
/***** Is this row hidden or visible? *****/
|
||||||
if (Gbl.FileBrowser.Type == Brw_SHOW_DOCUM_CRS ||
|
if (Gbl.FileBrowser.Type == Brw_SHOW_DOC_CRS ||
|
||||||
Gbl.FileBrowser.Type == Brw_SHOW_DOCUM_GRP)
|
Gbl.FileBrowser.Type == Brw_SHOW_DOC_GRP)
|
||||||
if (Brw_CheckIfFileOrFolderIsSetAsHiddenInDB (FileType,
|
if (Brw_CheckIfFileOrFolderIsSetAsHiddenInDB (FileType,
|
||||||
Gbl.FileBrowser.Priv.FullPathInTree))
|
Gbl.FileBrowser.Priv.FullPathInTree))
|
||||||
return false;
|
return false;
|
||||||
|
@ -4648,13 +4648,13 @@ int swad__getFile (struct soap *soap,
|
||||||
/***** Check if file is in a valid zone *****/
|
/***** Check if file is in a valid zone *****/
|
||||||
switch ((Gbl.FileBrowser.Type = FileMetadata.FileBrowser))
|
switch ((Gbl.FileBrowser.Type = FileMetadata.FileBrowser))
|
||||||
{
|
{
|
||||||
case Brw_ADMI_DOCUM_CRS:
|
case Brw_ADMI_DOC_CRS:
|
||||||
case Brw_ADMI_DOCUM_GRP:
|
case Brw_ADMI_DOC_GRP:
|
||||||
case Brw_ADMI_SHARE_CRS:
|
case Brw_ADMI_SHR_CRS:
|
||||||
case Brw_ADMI_SHARE_GRP:
|
case Brw_ADMI_SHR_GRP:
|
||||||
break;
|
break;
|
||||||
case Brw_ADMI_MARKS_CRS:
|
case Brw_ADMI_MRK_CRS:
|
||||||
case Brw_ADMI_MARKS_GRP:
|
case Brw_ADMI_MRK_GRP:
|
||||||
// Downloading a file of marks is only allowed for teachers
|
// Downloading a file of marks is only allowed for teachers
|
||||||
if (Gbl.Usrs.Me.UsrDat.Roles.InCurrentCrs.Role != Rol_TCH)
|
if (Gbl.Usrs.Me.UsrDat.Roles.InCurrentCrs.Role != Rol_TCH)
|
||||||
return soap_receiver_fault (Gbl.soap,
|
return soap_receiver_fault (Gbl.soap,
|
||||||
|
@ -4747,8 +4747,8 @@ int swad__getMarks (struct soap *soap,
|
||||||
|
|
||||||
if (FileMetadata.FileType != Brw_IS_FILE ||
|
if (FileMetadata.FileType != Brw_IS_FILE ||
|
||||||
FileMetadata.IsHidden ||
|
FileMetadata.IsHidden ||
|
||||||
(FileMetadata.FileBrowser != Brw_ADMI_MARKS_CRS &&
|
(FileMetadata.FileBrowser != Brw_ADMI_MRK_CRS &&
|
||||||
FileMetadata.FileBrowser != Brw_ADMI_MARKS_GRP))
|
FileMetadata.FileBrowser != Brw_ADMI_MRK_GRP))
|
||||||
return soap_receiver_fault (Gbl.soap,
|
return soap_receiver_fault (Gbl.soap,
|
||||||
"Bad file code",
|
"Bad file code",
|
||||||
"You can not get marks from this file");
|
"You can not get marks from this file");
|
||||||
|
|
68
swad_zip.c
68
swad_zip.c
|
@ -57,33 +57,33 @@
|
||||||
const Act_Action_t ZIP_ActZIPFolder[Brw_NUM_TYPES_FILE_BROWSER] =
|
const Act_Action_t ZIP_ActZIPFolder[Brw_NUM_TYPES_FILE_BROWSER] =
|
||||||
{
|
{
|
||||||
ActUnk, // Brw_UNKNOWN
|
ActUnk, // Brw_UNKNOWN
|
||||||
ActZIPSeeDocCrs, // Brw_SHOW_DOCUM_CRS
|
ActZIPSeeDocCrs, // Brw_SHOW_DOC_CRS
|
||||||
ActUnk, // Brw_SHOW_MARKS_CRS
|
ActUnk, // Brw_SHOW_MRK_CRS
|
||||||
ActZIPAdmDocCrs, // Brw_ADMI_DOCUM_CRS
|
ActZIPAdmDocCrs, // Brw_ADMI_DOC_CRS
|
||||||
ActZIPShaCrs, // Brw_ADMI_SHARE_CRS
|
ActZIPShaCrs, // Brw_ADMI_SHR_CRS
|
||||||
ActZIPShaGrp, // Brw_ADMI_SHARE_GRP
|
ActZIPShaGrp, // Brw_ADMI_SHR_GRP
|
||||||
ActZIPWrkUsr, // Brw_ADMI_WORKS_USR
|
ActZIPWrkUsr, // Brw_ADMI_WRK_USR
|
||||||
ActZIPWrkCrs, // Brw_ADMI_WORKS_CRS
|
ActZIPWrkCrs, // Brw_ADMI_WRK_CRS
|
||||||
ActZIPAdmMrkCrs, // Brw_ADMI_MARKS_CRS
|
ActZIPAdmMrkCrs, // Brw_ADMI_MRK_CRS
|
||||||
ActZIPBrf, // Brw_ADMI_BRIEF_USR
|
ActZIPBrf, // Brw_ADMI_BRF_USR
|
||||||
ActZIPSeeDocGrp, // Brw_SHOW_DOCUM_GRP
|
ActZIPSeeDocGrp, // Brw_SHOW_DOC_GRP
|
||||||
ActZIPAdmDocGrp, // Brw_ADMI_DOCUM_GRP
|
ActZIPAdmDocGrp, // Brw_ADMI_DOC_GRP
|
||||||
ActUnk, // Brw_SHOW_MARKS_GRP
|
ActUnk, // Brw_SHOW_MRK_GRP
|
||||||
ActZIPAdmMrkGrp, // Brw_ADMI_MARKS_GRP
|
ActZIPAdmMrkGrp, // Brw_ADMI_MRK_GRP
|
||||||
ActZIPAsgUsr, // Brw_ADMI_ASSIG_USR
|
ActZIPAsgUsr, // Brw_ADMI_ASG_USR
|
||||||
ActZIPAsgCrs, // Brw_ADMI_ASSIG_CRS
|
ActZIPAsgCrs, // Brw_ADMI_ASG_CRS
|
||||||
ActZIPSeeDocDeg, // Brw_SHOW_DOCUM_DEG
|
ActZIPSeeDocDeg, // Brw_SHOW_DOC_DEG
|
||||||
ActZIPAdmDocDeg, // Brw_ADMI_DOCUM_DEG
|
ActZIPAdmDocDeg, // Brw_ADMI_DOC_DEG
|
||||||
ActZIPSeeDocCtr, // Brw_SHOW_DOCUM_CTR
|
ActZIPSeeDocCtr, // Brw_SHOW_DOC_CTR
|
||||||
ActZIPAdmDocCtr, // Brw_ADMI_DOCUM_CTR
|
ActZIPAdmDocCtr, // Brw_ADMI_DOC_CTR
|
||||||
ActZIPSeeDocIns, // Brw_SHOW_DOCUM_INS
|
ActZIPSeeDocIns, // Brw_SHOW_DOC_INS
|
||||||
ActZIPAdmDocIns, // Brw_ADMI_DOCUM_INS
|
ActZIPAdmDocIns, // Brw_ADMI_DOC_INS
|
||||||
ActZIPShaDeg, // Brw_ADMI_SHARE_DEG
|
ActZIPShaDeg, // Brw_ADMI_SHR_DEG
|
||||||
ActZIPShaCtr, // Brw_ADMI_SHARE_CTR
|
ActZIPShaCtr, // Brw_ADMI_SHR_CTR
|
||||||
ActZIPShaIns, // Brw_ADMI_SHARE_INS
|
ActZIPShaIns, // Brw_ADMI_SHR_INS
|
||||||
ActZIPTchCrs, // Brw_ADMI_TEACH_CRS
|
ActZIPTchCrs, // Brw_ADMI_TCH_CRS
|
||||||
ActZIPTchGrp, // Brw_ADMI_TEACH_GRP
|
ActZIPTchGrp, // Brw_ADMI_TCH_GRP
|
||||||
ActZIPDocPrj, // Brw_ADMI_DOCUM_PRJ
|
ActZIPDocPrj, // Brw_ADMI_DOC_PRJ
|
||||||
};
|
};
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
@ -516,13 +516,13 @@ static unsigned long long ZIP_CloneDir (const char *Path,const char *PathClone,c
|
||||||
struct stat FileStatus;
|
struct stat FileStatus;
|
||||||
Brw_FileType_t FileType;
|
Brw_FileType_t FileType;
|
||||||
bool Hidden;
|
bool Hidden;
|
||||||
bool SeeDocsZone = Gbl.FileBrowser.Type == Brw_SHOW_DOCUM_INS ||
|
bool SeeDocsZone = Gbl.FileBrowser.Type == Brw_SHOW_DOC_INS ||
|
||||||
Gbl.FileBrowser.Type == Brw_SHOW_DOCUM_CTR ||
|
Gbl.FileBrowser.Type == Brw_SHOW_DOC_CTR ||
|
||||||
Gbl.FileBrowser.Type == Brw_SHOW_DOCUM_DEG ||
|
Gbl.FileBrowser.Type == Brw_SHOW_DOC_DEG ||
|
||||||
Gbl.FileBrowser.Type == Brw_SHOW_DOCUM_CRS ||
|
Gbl.FileBrowser.Type == Brw_SHOW_DOC_CRS ||
|
||||||
Gbl.FileBrowser.Type == Brw_SHOW_DOCUM_GRP;
|
Gbl.FileBrowser.Type == Brw_SHOW_DOC_GRP;
|
||||||
bool SeeMarks = Gbl.FileBrowser.Type == Brw_SHOW_MARKS_CRS ||
|
bool SeeMarks = Gbl.FileBrowser.Type == Brw_SHOW_MRK_CRS ||
|
||||||
Gbl.FileBrowser.Type == Brw_SHOW_MARKS_GRP;
|
Gbl.FileBrowser.Type == Brw_SHOW_MRK_GRP;
|
||||||
unsigned long long FullSize = 0;
|
unsigned long long FullSize = 0;
|
||||||
|
|
||||||
/***** Scan directory *****/
|
/***** Scan directory *****/
|
||||||
|
|
Loading…
Reference in New Issue