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 14.69.1

This commit is contained in:
Antonio Cañas Vargas 2015-01-26 12:39:48 +01:00
parent 7c214165c6
commit b59eb9d907
17 changed files with 1871 additions and 1868 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
swad_changelog.h
View File

@ -39,13 +39,12 @@
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 14.69 (2015/01/26)" #define Log_PLATFORM_VERSION "SWAD 14.69.1 (2015/01/26)"
// 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 | tail -1 // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h | tail -1
/* /*
Comprobar que se pueden buscar documentos abiertos en titulaciones, centros e instituciones Version 14.69.1: Jan 26, 2015 Code refactoring related to file browsers. (175822 lines)
Version 14.69: Jan 26, 2015 Changes in search of documents. (175818 lines) Version 14.69: Jan 26, 2015 Changes in search of documents. (175818 lines)
Version 14.68.2: Jan 25, 2015 Fixed bugs in search of documents. Version 14.68.2: Jan 25, 2015 Fixed bugs in search of documents.
Search of user's documents now extended to institution, centre and degree. (175644 lines) Search of user's documents now extended to institution, centre and degree. (175644 lines)
@ -1223,7 +1222,7 @@ Check if all works fine.
Version 13.17: Nov 26, 2013 User's private briefcase is stored using user's code instead of user's ID. (158598 lines) Version 13.17: Nov 26, 2013 User's private briefcase is stored using user's code instead of user's ID. (158598 lines)
Important change necessary to move old briefcases to new briefcases: Important change necessary to move old briefcases to new briefcases:
Configure swad_convert_briefcases.c (change defines), compile it and execute swad_convert_briefcases as root. Configure swad_convert_BRIEFs.c (change defines), compile it and execute swad_convert_BRIEFs as root.
Check if all works fine, and then remove usr_backup private directory. Check if all works fine, and then remove usr_backup private directory.
Version 13.16: Nov 26, 2013 User's private photo is stored using user's code instead of user's ID. (158473 lines) Version 13.16: Nov 26, 2013 User's private photo is stored using user's code instead of user's ID. (158473 lines)
@ -2302,7 +2301,7 @@ INSERT INTO actions (ActCod,Language,Obsolete,Txt) VALUES ('1051','es','N','Camb
Version 11.56: Apr 21, 2012 All the folders/files are stored in database, including the creator. (132920 lines) Version 11.56: Apr 21, 2012 All the folders/files are stored in database, including the creator. (132920 lines)
Version 11.55.10:Apr 20, 2012 Internal optimizations in functions related to file browsers. (132889 lines) Version 11.55.10:Apr 20, 2012 Internal optimizations in functions related to file browsers. (132889 lines)
Version 11.55.10:Apr 19, 2012 New field 'FileBrowser' in database table 'files'. (132853 lines) Version 11.55.10:Apr 19, 2012 New field 'FileBrowser' in database table 'files'. (132853 lines)
Version 11.55.9: Apr 19, 2012 Database table 'crs_common_files' is renamed to files. (132829 lines) Version 11.55.9: Apr 19, 2012 Database table 'crs_SHARE_files' is renamed to files. (132829 lines)
Version 11.55.8: Apr 19, 2012 File licenses translated to several languages. (132828 lines) Version 11.55.8: Apr 19, 2012 File licenses translated to several languages. (132828 lines)
Version 11.55.7: Apr 19, 2012 Changes in web service function getCourses. (132827 lines) Version 11.55.7: Apr 19, 2012 Changes in web service function getCourses. (132827 lines)
Version 11.55.6: Apr 18, 2012 Changes in selection of languages. (132657 lines) Version 11.55.6: Apr 18, 2012 Changes in selection of languages. (132657 lines)

4
swad_convert_briefcases.c
View File

@ -1,7 +1,7 @@
// swad_convert_briefcases.c // swad_convert_BRIEFs.c
// Created on: 26/11/2013 // Created on: 26/11/2013
// Author: Antonio Cañas Vargas // Author: Antonio Cañas Vargas
// Compile with: gcc -Wall -O1 swad_convert_briefcases.c -o swad_convert_briefcases -lmysqlclient -L/usr/lib64/mysql // Compile with: gcc -Wall -O1 swad_convert_BRIEFs.c -o swad_convert_BRIEFs -lmysqlclient -L/usr/lib64/mysql
#include <mysql/mysql.h> #include <mysql/mysql.h>
#include <limits.h> #include <limits.h>

3046
swad_file_browser.c
View File

File diff suppressed because it is too large Load Diff

48
swad_file_browser.h
View File

@ -39,28 +39,28 @@
// The following types are stored in clipboard, expanded_folders, file_browser_size tables as numeric fields, so don't change numbers! // The following types are stored in clipboard, expanded_folders, file_browser_size tables as numeric fields, so don't change numbers!
typedef enum typedef enum
{ {
Brw_FILE_BRW_UNKNOWN = 0, Brw_UNKNOWN = 0,
Brw_FILE_BRW_SEE_DOCUMENTS_CRS = 1, Brw_SHOW_DOCUM_CRS = 1,
Brw_FILE_BRW_SEE_MARKS_CRS = 2, Brw_SHOW_MARKS_CRS = 2,
Brw_FILE_BRW_ADMIN_DOCUMENTS_CRS = 3, Brw_ADMI_DOCUM_CRS = 3,
Brw_FILE_BRW_COMMON_CRS = 4, Brw_ADMI_SHARE_CRS = 4,
Brw_FILE_BRW_COMMON_GRP = 5, Brw_ADMI_SHARE_GRP = 5,
Brw_FILE_BRW_WORKS_USR = 6, Brw_ADMI_WORKS_USR = 6,
Brw_FILE_BRW_WORKS_CRS = 7, Brw_ADMI_WORKS_CRS = 7,
Brw_FILE_BRW_ADMIN_MARKS_CRS = 8, Brw_ADMI_MARKS_CRS = 8,
Brw_FILE_BRW_BRIEFCASE_USR = 9, Brw_ADMI_BRIEF_USR = 9,
Brw_FILE_BRW_SEE_DOCUMENTS_GRP = 10, Brw_SHOW_DOCUM_GRP = 10,
Brw_FILE_BRW_ADMIN_DOCUMENTS_GRP = 11, Brw_ADMI_DOCUM_GRP = 11,
Brw_FILE_BRW_SEE_MARKS_GRP = 12, Brw_SHOW_MARKS_GRP = 12,
Brw_FILE_BRW_ADMIN_MARKS_GRP = 13, Brw_ADMI_MARKS_GRP = 13,
Brw_FILE_BRW_ASSIGNMENTS_USR = 14, Brw_ADMI_ASSIG_USR = 14,
Brw_FILE_BRW_ASSIGNMENTS_CRS = 15, Brw_ADMI_ASSIG_CRS = 15,
Brw_FILE_BRW_SEE_DOCUMENTS_DEG = 16, Brw_SHOW_DOCUM_DEG = 16,
Brw_FILE_BRW_ADMIN_DOCUMENTS_DEG = 17, Brw_ADMI_DOCUM_DEG = 17,
Brw_FILE_BRW_SEE_DOCUMENTS_CTR = 18, Brw_SHOW_DOCUM_CTR = 18,
Brw_FILE_BRW_ADMIN_DOCUMENTS_CTR = 19, Brw_ADMI_DOCUM_CTR = 19,
Brw_FILE_BRW_SEE_DOCUMENTS_INS = 20, Brw_SHOW_DOCUM_INS = 20,
Brw_FILE_BRW_ADMIN_DOCUMENTS_INS = 21, Brw_ADMI_DOCUM_INS = 21,
} 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!
@ -124,11 +124,11 @@ struct FileMetadata
#define Brw_INTERNAL_NAME_ROOT_FOLDER_DOCUMENTS "doc" #define Brw_INTERNAL_NAME_ROOT_FOLDER_DOCUMENTS "doc"
#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 "doc"
#define Brw_INTERNAL_NAME_ROOT_FOLDER_COMMON "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_MARKS "calificaciones" // TODO: It should be "mrk" #define Brw_INTERNAL_NAME_ROOT_FOLDER_MARKS "calificaciones" // TODO: It should be "mrk"
#define Brw_INTERNAL_NAME_ROOT_FOLDER_BRIEFCASE "maletin" // TODO: It should be "brf" #define Brw_INTERNAL_NAME_ROOT_FOLDER_BRIEF "maletin" // TODO: It should be "brf"
/*****************************************************************************/ /*****************************************************************************/
/***************************** Public prototypes *****************************/ /***************************** Public prototypes *****************************/

2
swad_global.c
View File

@ -423,7 +423,7 @@ void Gbl_InitializeGlobals (void)
Gbl.Usrs.Me.UsrDat.Nickname[0] = '\0'; Gbl.Usrs.Me.UsrDat.Nickname[0] = '\0';
/* File browser */ /* File browser */
Gbl.FileBrowser.Type = Brw_FILE_BRW_UNKNOWN; Gbl.FileBrowser.Type = Brw_UNKNOWN;
Gbl.FileBrowser.FileType = Brw_IS_UNKNOWN; Gbl.FileBrowser.FileType = Brw_IS_UNKNOWN;
Gbl.FileBrowser.UploadingWithDropzone = false; Gbl.FileBrowser.UploadingWithDropzone = false;

20
swad_indicator.c
View File

@ -477,8 +477,8 @@ static void Ind_ShowTableOfCoursesWithIndicators (Ind_IndicatorsLayout_t Indicat
extern const char *Txt_No_INDEX; extern const char *Txt_No_INDEX;
extern const char *Txt_Syllabus_of_the_course; extern const char *Txt_Syllabus_of_the_course;
extern const char *Txt_INFO_TITLE[Inf_NUM_INFO_TYPES]; extern const char *Txt_INFO_TITLE[Inf_NUM_INFO_TYPES];
extern const char *Txt_No_of_files_in_common_zones; extern const char *Txt_No_of_files_in_SHARE_zones;
extern const char *Txt_No_of_files_in_documents_zones; extern const char *Txt_No_of_files_in_DOCUM_zones;
extern const char *Txt_Guided_academic_assignments; extern const char *Txt_Guided_academic_assignments;
extern const char *Txt_Assignments; extern const char *Txt_Assignments;
extern const char *Txt_Files_assignments; extern const char *Txt_Files_assignments;
@ -839,8 +839,8 @@ static void Ind_ShowTableOfCoursesWithIndicators (Ind_IndicatorsLayout_t Indicat
Gbl.ColorRows[0],Txt_YES, Gbl.ColorRows[0],Txt_YES,
Gbl.ColorRows[0],Txt_NO, Gbl.ColorRows[0],Txt_NO,
Gbl.ColorRows[0],Txt_No_of_files_in_documents_zones, Gbl.ColorRows[0],Txt_No_of_files_in_DOCUM_zones,
Gbl.ColorRows[0],Txt_No_of_files_in_common_zones, Gbl.ColorRows[0],Txt_No_of_files_in_SHARE_zones,
Gbl.ColorRows[0],Txt_YES, Gbl.ColorRows[0],Txt_YES,
Gbl.ColorRows[0],Txt_NO, Gbl.ColorRows[0],Txt_NO,
@ -1330,11 +1330,11 @@ void Ind_GetIndicatorsCrs (long CrsCod,struct Ind_IndicatorsCrs *Indicators)
Indicators->CountIndicators = 0; Indicators->CountIndicators = 0;
/* Get whether download zones are empty or not */ /* Get whether download zones are empty or not */
Indicators->NumFilesInDownloadZonesCrs = Ind_GetNumFilesOfCrsFileZoneFromDB (Brw_FILE_BRW_ADMIN_DOCUMENTS_CRS,CrsCod); Indicators->NumFilesInDownloadZonesCrs = Ind_GetNumFilesOfCrsFileZoneFromDB (Brw_ADMI_DOCUM_CRS,CrsCod);
Indicators->NumFilesInDownloadZonesGrp = Ind_GetNumFilesOfCrsFileZoneFromDB (Brw_FILE_BRW_ADMIN_DOCUMENTS_GRP,CrsCod); Indicators->NumFilesInDownloadZonesGrp = Ind_GetNumFilesOfCrsFileZoneFromDB (Brw_ADMI_DOCUM_GRP,CrsCod);
Indicators->NumFilesInDownloadZones = Indicators->NumFilesInDownloadZonesCrs + Indicators->NumFilesInDownloadZonesGrp; Indicators->NumFilesInDownloadZones = Indicators->NumFilesInDownloadZonesCrs + Indicators->NumFilesInDownloadZonesGrp;
Indicators->NumFilesInCommonZonesCrs = Ind_GetNumFilesOfCrsFileZoneFromDB (Brw_FILE_BRW_COMMON_CRS,CrsCod); Indicators->NumFilesInCommonZonesCrs = Ind_GetNumFilesOfCrsFileZoneFromDB (Brw_ADMI_SHARE_CRS,CrsCod);
Indicators->NumFilesInCommonZonesGrp = Ind_GetNumFilesOfCrsFileZoneFromDB (Brw_FILE_BRW_COMMON_GRP,CrsCod); Indicators->NumFilesInCommonZonesGrp = Ind_GetNumFilesOfCrsFileZoneFromDB (Brw_ADMI_SHARE_GRP,CrsCod);
Indicators->NumFilesInCommonZones = Indicators->NumFilesInCommonZonesCrs + Indicators->NumFilesInCommonZonesGrp; Indicators->NumFilesInCommonZones = Indicators->NumFilesInCommonZonesCrs + Indicators->NumFilesInCommonZonesGrp;
/* Indicator #1: information about syllabus */ /* Indicator #1: information about syllabus */
@ -1349,8 +1349,8 @@ void Ind_GetIndicatorsCrs (long CrsCod,struct Ind_IndicatorsCrs *Indicators)
/* Indicator #2: information about assignments */ /* Indicator #2: information about assignments */
Indicators->NumAssignments = Asg_GetNumAssignmentsInCrs (CrsCod); Indicators->NumAssignments = Asg_GetNumAssignmentsInCrs (CrsCod);
Indicators->NumFilesAssignments = Ind_GetNumFilesOfCrsFileZoneFromDB (Brw_FILE_BRW_ASSIGNMENTS_USR,CrsCod); Indicators->NumFilesAssignments = Ind_GetNumFilesOfCrsFileZoneFromDB (Brw_ADMI_ASSIG_USR,CrsCod);
Indicators->NumFilesWorks = Ind_GetNumFilesOfCrsFileZoneFromDB (Brw_FILE_BRW_WORKS_USR ,CrsCod); Indicators->NumFilesWorks = Ind_GetNumFilesOfCrsFileZoneFromDB (Brw_ADMI_WORKS_USR ,CrsCod);
Indicators->ThereAreAssignments = (Indicators->NumAssignments != 0) || Indicators->ThereAreAssignments = (Indicators->NumAssignments != 0) ||
(Indicators->NumFilesAssignments != 0) || (Indicators->NumFilesAssignments != 0) ||
(Indicators->NumFilesWorks != 0); (Indicators->NumFilesWorks != 0);

56
swad_layout.c
View File

@ -185,20 +185,20 @@ void Lay_WriteStartOfPage (void)
// css/dropzone.css // css/dropzone.css
// images/spritemap@2x.png // images/spritemap@2x.png
// images/spritemap.png // images/spritemap.png
if (Gbl.CurrentAct == ActFrmCreDocIns || // Brw_FILE_BRW_ADMIN_DOCUMENTS_INS if (Gbl.CurrentAct == ActFrmCreDocIns || // Brw_ADMI_DOCUM_INS
Gbl.CurrentAct == ActFrmCreDocCtr || // Brw_FILE_BRW_ADMIN_DOCUMENTS_CTR Gbl.CurrentAct == ActFrmCreDocCtr || // Brw_ADMI_DOCUM_CTR
Gbl.CurrentAct == ActFrmCreDocDeg || // Brw_FILE_BRW_ADMIN_DOCUMENTS_DEG Gbl.CurrentAct == ActFrmCreDocDeg || // Brw_ADMI_DOCUM_DEG
Gbl.CurrentAct == ActFrmCreDocCrs || // Brw_FILE_BRW_ADMIN_DOCUMENTS_CRS Gbl.CurrentAct == ActFrmCreDocCrs || // Brw_ADMI_DOCUM_CRS
Gbl.CurrentAct == ActFrmCreDocGrp || // Brw_FILE_BRW_ADMIN_DOCUMENTS_GRP Gbl.CurrentAct == ActFrmCreDocGrp || // Brw_ADMI_DOCUM_GRP
Gbl.CurrentAct == ActFrmCreComCrs || // Brw_FILE_BRW_COMMON_CRS Gbl.CurrentAct == ActFrmCreComCrs || // Brw_ADMI_SHARE_CRS
Gbl.CurrentAct == ActFrmCreComGrp || // Brw_FILE_BRW_COMMON_GRP Gbl.CurrentAct == ActFrmCreComGrp || // Brw_ADMI_SHARE_GRP
Gbl.CurrentAct == ActFrmCreAsgUsr || // Brw_FILE_BRW_ASSIGNMENTS_USR Gbl.CurrentAct == ActFrmCreAsgUsr || // Brw_ADMI_ASSIG_USR
Gbl.CurrentAct == ActFrmCreAsgCrs || // Brw_FILE_BRW_ASSIGNMENTS_CRS Gbl.CurrentAct == ActFrmCreAsgCrs || // Brw_ADMI_ASSIG_CRS
Gbl.CurrentAct == ActFrmCreWrkUsr || // Brw_FILE_BRW_WORKS_USR Gbl.CurrentAct == ActFrmCreWrkUsr || // Brw_ADMI_WORKS_USR
Gbl.CurrentAct == ActFrmCreWrkCrs || // Brw_FILE_BRW_WORKS_CRS Gbl.CurrentAct == ActFrmCreWrkCrs || // Brw_ADMI_WORKS_CRS
Gbl.CurrentAct == ActFrmCreMrkCrs || // Brw_FILE_BRW_ADMIN_MARKS_CRS Gbl.CurrentAct == ActFrmCreMrkCrs || // Brw_ADMI_MARKS_CRS
Gbl.CurrentAct == ActFrmCreMrkGrp || // Brw_FILE_BRW_ADMIN_MARKS_GRP Gbl.CurrentAct == ActFrmCreMrkGrp || // Brw_ADMI_MARKS_GRP
Gbl.CurrentAct == ActFrmCreBrf) // Brw_FILE_BRW_BRIEFCASE_USR Gbl.CurrentAct == ActFrmCreBrf) // Brw_ADMI_BRIEF_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",
@ -434,20 +434,20 @@ 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
if (Gbl.CurrentAct == ActFrmCreDocIns || // Brw_FILE_BRW_ADMIN_DOCUMENTS_INS if (Gbl.CurrentAct == ActFrmCreDocIns || // Brw_ADMI_DOCUM_INS
Gbl.CurrentAct == ActFrmCreDocCtr || // Brw_FILE_BRW_ADMIN_DOCUMENTS_CTR Gbl.CurrentAct == ActFrmCreDocCtr || // Brw_ADMI_DOCUM_CTR
Gbl.CurrentAct == ActFrmCreDocDeg || // Brw_FILE_BRW_ADMIN_DOCUMENTS_DEG Gbl.CurrentAct == ActFrmCreDocDeg || // Brw_ADMI_DOCUM_DEG
Gbl.CurrentAct == ActFrmCreDocCrs || // Brw_FILE_BRW_ADMIN_DOCUMENTS_CRS Gbl.CurrentAct == ActFrmCreDocCrs || // Brw_ADMI_DOCUM_CRS
Gbl.CurrentAct == ActFrmCreDocGrp || // Brw_FILE_BRW_ADMIN_DOCUMENTS_GRP Gbl.CurrentAct == ActFrmCreDocGrp || // Brw_ADMI_DOCUM_GRP
Gbl.CurrentAct == ActFrmCreComCrs || // Brw_FILE_BRW_COMMON_CRS Gbl.CurrentAct == ActFrmCreComCrs || // Brw_ADMI_SHARE_CRS
Gbl.CurrentAct == ActFrmCreComGrp || // Brw_FILE_BRW_COMMON_GRP Gbl.CurrentAct == ActFrmCreComGrp || // Brw_ADMI_SHARE_GRP
Gbl.CurrentAct == ActFrmCreAsgUsr || // Brw_FILE_BRW_ASSIGNMENTS_USR Gbl.CurrentAct == ActFrmCreAsgUsr || // Brw_ADMI_ASSIG_USR
Gbl.CurrentAct == ActFrmCreAsgCrs || // Brw_FILE_BRW_ASSIGNMENTS_CRS Gbl.CurrentAct == ActFrmCreAsgCrs || // Brw_ADMI_ASSIG_CRS
Gbl.CurrentAct == ActFrmCreWrkUsr || // Brw_FILE_BRW_WORKS_USR Gbl.CurrentAct == ActFrmCreWrkUsr || // Brw_ADMI_WORKS_USR
Gbl.CurrentAct == ActFrmCreWrkCrs || // Brw_FILE_BRW_WORKS_CRS Gbl.CurrentAct == ActFrmCreWrkCrs || // Brw_ADMI_WORKS_CRS
Gbl.CurrentAct == ActFrmCreMrkCrs || // Brw_FILE_BRW_ADMIN_MARKS_CRS Gbl.CurrentAct == ActFrmCreMrkCrs || // Brw_ADMI_MARKS_CRS
Gbl.CurrentAct == ActFrmCreMrkGrp || // Brw_FILE_BRW_ADMIN_MARKS_GRP Gbl.CurrentAct == ActFrmCreMrkGrp || // Brw_ADMI_MARKS_GRP
Gbl.CurrentAct == ActFrmCreBrf) // Brw_FILE_BRW_BRIEFCASE_USR Gbl.CurrentAct == ActFrmCreBrf) // Brw_ADMI_BRIEF_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\""

2
swad_mark.c
View File

@ -696,7 +696,7 @@ void Mrk_GetNotifMyMarks (char *SummaryStr,char **ContentStr,
row = mysql_fetch_row (mysql_res); row = mysql_fetch_row (mysql_res);
/* Get file browser type in database (row[0]) */ /* Get file browser type in database (row[0]) */
FileBrowser = Brw_FILE_BRW_UNKNOWN; FileBrowser = Brw_UNKNOWN;
if (sscanf (row[0],"%u",&UnsignedNum) == 1) if (sscanf (row[0],"%u",&UnsignedNum) == 1)
if (UnsignedNum < Brw_NUM_TYPES_FILE_BROWSER) if (UnsignedNum < Brw_NUM_TYPES_FILE_BROWSER)
FileBrowser = (Brw_FileBrowser_t) UnsignedNum; FileBrowser = (Brw_FileBrowser_t) UnsignedNum;

66
swad_notification.c
View File

@ -853,16 +853,16 @@ void Ntf_SetNotifOneFileAsRemoved (Brw_FileBrowser_t FileBrowser,
/***** Set notify event depending on browser zone *****/ /***** Set notify event depending on browser zone *****/
switch (FileBrowser) switch (FileBrowser)
{ {
case Brw_FILE_BRW_ADMIN_DOCUMENTS_CRS: case Brw_ADMI_DOCUM_CRS:
case Brw_FILE_BRW_ADMIN_DOCUMENTS_GRP: case Brw_ADMI_DOCUM_GRP:
NotifyEvent = Ntf_EVENT_DOCUMENT_FILE; NotifyEvent = Ntf_EVENT_DOCUMENT_FILE;
break; break;
case Brw_FILE_BRW_COMMON_CRS: case Brw_ADMI_SHARE_CRS:
case Brw_FILE_BRW_COMMON_GRP: case Brw_ADMI_SHARE_GRP:
NotifyEvent = Ntf_EVENT_SHARED_FILE; NotifyEvent = Ntf_EVENT_SHARED_FILE;
break; break;
case Brw_FILE_BRW_ADMIN_MARKS_CRS: case Brw_ADMI_MARKS_CRS:
case Brw_FILE_BRW_ADMIN_MARKS_GRP: case Brw_ADMI_MARKS_GRP:
NotifyEvent = Ntf_EVENT_MARKS_FILE; NotifyEvent = Ntf_EVENT_MARKS_FILE;
break; break;
default: default:
@ -872,12 +872,12 @@ void Ntf_SetNotifOneFileAsRemoved (Brw_FileBrowser_t FileBrowser,
/***** Set notification as removed *****/ /***** Set notification as removed *****/
switch (FileBrowser) switch (FileBrowser)
{ {
case Brw_FILE_BRW_ADMIN_DOCUMENTS_CRS: case Brw_ADMI_DOCUM_CRS:
case Brw_FILE_BRW_ADMIN_DOCUMENTS_GRP: case Brw_ADMI_DOCUM_GRP:
case Brw_FILE_BRW_COMMON_CRS: case Brw_ADMI_SHARE_CRS:
case Brw_FILE_BRW_COMMON_GRP: case Brw_ADMI_SHARE_GRP:
case Brw_FILE_BRW_ADMIN_MARKS_CRS: case Brw_ADMI_MARKS_CRS:
case Brw_FILE_BRW_ADMIN_MARKS_GRP: case Brw_ADMI_MARKS_GRP:
sprintf (SubQuery,"SELECT FilCod FROM files" sprintf (SubQuery,"SELECT FilCod FROM files"
" WHERE FileBrowser='%u' AND Cod='%ld' AND Path='%s'", " WHERE FileBrowser='%u' AND Cod='%ld' AND Path='%s'",
(unsigned) FileBrowser,Cod,Path); (unsigned) FileBrowser,Cod,Path);
@ -906,16 +906,16 @@ void Ntf_SetNotifChildrenOfFolderAsRemoved (Brw_FileBrowser_t FileBrowser,
/***** Set notify event depending on browser zone *****/ /***** Set notify event depending on browser zone *****/
switch (FileBrowser) switch (FileBrowser)
{ {
case Brw_FILE_BRW_ADMIN_DOCUMENTS_CRS: case Brw_ADMI_DOCUM_CRS:
case Brw_FILE_BRW_ADMIN_DOCUMENTS_GRP: case Brw_ADMI_DOCUM_GRP:
NotifyEvent = Ntf_EVENT_DOCUMENT_FILE; NotifyEvent = Ntf_EVENT_DOCUMENT_FILE;
break; break;
case Brw_FILE_BRW_COMMON_CRS: case Brw_ADMI_SHARE_CRS:
case Brw_FILE_BRW_COMMON_GRP: case Brw_ADMI_SHARE_GRP:
NotifyEvent = Ntf_EVENT_SHARED_FILE; NotifyEvent = Ntf_EVENT_SHARED_FILE;
break; break;
case Brw_FILE_BRW_ADMIN_MARKS_CRS: case Brw_ADMI_MARKS_CRS:
case Brw_FILE_BRW_ADMIN_MARKS_GRP: case Brw_ADMI_MARKS_GRP:
NotifyEvent = Ntf_EVENT_MARKS_FILE; NotifyEvent = Ntf_EVENT_MARKS_FILE;
break; break;
default: default:
@ -925,12 +925,12 @@ void Ntf_SetNotifChildrenOfFolderAsRemoved (Brw_FileBrowser_t FileBrowser,
/***** Set notification as removed *****/ /***** Set notification as removed *****/
switch (FileBrowser) switch (FileBrowser)
{ {
case Brw_FILE_BRW_ADMIN_DOCUMENTS_CRS: case Brw_ADMI_DOCUM_CRS:
case Brw_FILE_BRW_ADMIN_DOCUMENTS_GRP: case Brw_ADMI_DOCUM_GRP:
case Brw_FILE_BRW_COMMON_CRS: case Brw_ADMI_SHARE_CRS:
case Brw_FILE_BRW_COMMON_GRP: case Brw_ADMI_SHARE_GRP:
case Brw_FILE_BRW_ADMIN_MARKS_CRS: case Brw_ADMI_MARKS_CRS:
case Brw_FILE_BRW_ADMIN_MARKS_GRP: case Brw_ADMI_MARKS_GRP:
sprintf (SubQuery,"SELECT FilCod FROM files" sprintf (SubQuery,"SELECT FilCod FROM files"
" WHERE FileBrowser='%u' AND Cod='%ld' AND Path LIKE '%s/%%'", " WHERE FileBrowser='%u' AND Cod='%ld' AND Path LIKE '%s/%%'",
(unsigned) FileBrowser,Cod,Path); (unsigned) FileBrowser,Cod,Path);
@ -962,9 +962,9 @@ void Ntf_SetNotifFilesInGroupAsRemoved (long GrpCod)
(unsigned) Ntf_EVENT_DOCUMENT_FILE, (unsigned) Ntf_EVENT_DOCUMENT_FILE,
(unsigned) Ntf_EVENT_SHARED_FILE, (unsigned) Ntf_EVENT_SHARED_FILE,
(unsigned) Ntf_EVENT_MARKS_FILE, (unsigned) Ntf_EVENT_MARKS_FILE,
(unsigned) Brw_FILE_BRW_ADMIN_DOCUMENTS_GRP, (unsigned) Brw_ADMI_DOCUM_GRP,
(unsigned) Brw_FILE_BRW_COMMON_GRP, (unsigned) Brw_ADMI_SHARE_GRP,
(unsigned) Brw_FILE_BRW_ADMIN_MARKS_GRP, (unsigned) Brw_ADMI_MARKS_GRP,
GrpCod); GrpCod);
DB_QueryUPDATE (Query,"can not set notification(s) as removed"); DB_QueryUPDATE (Query,"can not set notification(s) as removed");
} }
@ -996,18 +996,18 @@ 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_FILE_BRW_ADMIN_DOCUMENTS_CRS: case Brw_ADMI_DOCUM_CRS:
case Brw_FILE_BRW_COMMON_CRS: case Brw_ADMI_SHARE_CRS:
case Brw_FILE_BRW_ADMIN_MARKS_CRS: case Brw_ADMI_MARKS_CRS:
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_FILE_BRW_ADMIN_DOCUMENTS_GRP: case Brw_ADMI_DOCUM_GRP:
case Brw_FILE_BRW_COMMON_GRP: case Brw_ADMI_SHARE_GRP:
case Brw_FILE_BRW_ADMIN_MARKS_GRP: case Brw_ADMI_MARKS_GRP:
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'",

68
swad_record.c
View File

@ -1881,7 +1881,7 @@ void Rec_ShowFormMyCommRecord (void)
/***** My record *****/ /***** My record *****/
Act_FormStart (ActChgMyData); Act_FormStart (ActChgMyData);
Rec_ShowCommonRecord (Rec_FORM_MY_COMMON_RECORD,&Gbl.Usrs.Me.UsrDat); Rec_ShowCommonRecord (Rec_FORM_MY_SHARE_RECORD,&Gbl.Usrs.Me.UsrDat);
Lay_PutSendButton (Txt_Save_changes); Lay_PutSendButton (Txt_Save_changes);
Rec_WriteLinkToDataProtectionClause (); Rec_WriteLinkToDataProtectionClause ();
fprintf (Gbl.F.Out,"</form>" fprintf (Gbl.F.Out,"</form>"
@ -1957,7 +1957,7 @@ void Rec_ShowMyCommonRecordUpd (void)
/***** Show my record for checking *****/ /***** Show my record for checking *****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">"); fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
Rec_ShowCommonRecord (Rec_MY_COMMON_RECORD_CHECK,&Gbl.Usrs.Me.UsrDat); Rec_ShowCommonRecord (Rec_MY_SHARE_RECORD_CHECK,&Gbl.Usrs.Me.UsrDat);
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
} }
@ -1973,7 +1973,7 @@ void Rec_ShowCommonRecordUnmodifiable (struct UsrData *UsrDat)
/***** Show user's record *****/ /***** Show user's record *****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">"); fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
Rec_ShowCommonRecord (Rec_OTHER_USR_COMMON_RECORD_CHECK,UsrDat); Rec_ShowCommonRecord (Rec_OTHER_USR_SHARE_RECORD_CHECK,UsrDat);
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
} }
@ -2012,7 +2012,7 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
extern const char *Txt_Local_address; extern const char *Txt_Local_address;
extern const char *Txt_Family_address; extern const char *Txt_Family_address;
extern const char *Txt_USER_comments; extern const char *Txt_USER_comments;
unsigned RecordWidth = Rec_WIDTH_COMMON_RECORD_BIG; unsigned RecordWidth = Rec_WIDTH_SHARE_RECORD_BIG;
char StrRecordWidth[10+1]; char StrRecordWidth[10+1];
unsigned FrameWidth = 10; unsigned FrameWidth = 10;
unsigned Col1Width = 140; unsigned Col1Width = 140;
@ -2028,31 +2028,31 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
bool IAmSuperuser = (Gbl.Usrs.Me.LoggedRole == Rol_ROLE_SUPERUSER); // My current role is superuser bool IAmSuperuser = (Gbl.Usrs.Me.LoggedRole == Rol_ROLE_SUPERUSER); // My current role is superuser
bool HeIsTeacher = (UsrDat->Roles & (1 << Rol_ROLE_TEACHER)); // He/she already is a teacher in any course bool HeIsTeacher = (UsrDat->Roles & (1 << Rol_ROLE_TEACHER)); // He/she already is a teacher in any course
bool RoleForm = (TypeOfView == Rec_FORM_SIGN_UP || bool RoleForm = (TypeOfView == Rec_FORM_SIGN_UP ||
TypeOfView == Rec_FORM_MY_COMMON_RECORD || TypeOfView == Rec_FORM_MY_SHARE_RECORD ||
TypeOfView == Rec_FORM_NEW_RECORD_OTHER_NEW_USR || TypeOfView == Rec_FORM_NEW_RECORD_OTHER_NEW_USR ||
TypeOfView == Rec_FORM_MODIFY_RECORD_OTHER_EXISTING_USR); TypeOfView == Rec_FORM_MODIFY_RECORD_OTHER_EXISTING_USR);
bool DataForm = (TypeOfView == Rec_FORM_MY_COMMON_RECORD || bool DataForm = (TypeOfView == Rec_FORM_MY_SHARE_RECORD ||
TypeOfView == Rec_FORM_NEW_RECORD_OTHER_NEW_USR || TypeOfView == Rec_FORM_NEW_RECORD_OTHER_NEW_USR ||
(TypeOfView == Rec_FORM_MODIFY_RECORD_OTHER_EXISTING_USR && (TypeOfView == Rec_FORM_MODIFY_RECORD_OTHER_EXISTING_USR &&
!(IAmTeacher && HeIsTeacher))); // A teacher can not modify another teacher's data !(IAmTeacher && HeIsTeacher))); // A teacher can not modify another teacher's data
bool MsgForm = (Gbl.Usrs.Me.Logged && bool MsgForm = (Gbl.Usrs.Me.Logged &&
!(RoleForm || DataForm)); !(RoleForm || DataForm));
bool ShowEmail = (IAmDegAdmin || IAmSuperuser || DataForm || bool ShowEmail = (IAmDegAdmin || IAmSuperuser || DataForm ||
TypeOfView == Rec_FORM_MY_COMMON_RECORD || TypeOfView == Rec_FORM_MY_SHARE_RECORD ||
TypeOfView == Rec_MY_COMMON_RECORD_CHECK || TypeOfView == Rec_MY_SHARE_RECORD_CHECK ||
TypeOfView == Rec_FORM_MY_COURSE_RECORD || TypeOfView == Rec_FORM_MY_COURSE_RECORD ||
TypeOfView == Rec_MY_COURSE_RECORD_CHECK || TypeOfView == Rec_MY_COURSE_RECORD_CHECK ||
(UsrDat->Accepted && (UsrDat->Accepted &&
(TypeOfView == Rec_OTHER_USR_COMMON_RECORD_CHECK || (TypeOfView == Rec_OTHER_USR_SHARE_RECORD_CHECK ||
((TypeOfView == Rec_RECORD_LIST || TypeOfView == Rec_RECORD_PRINT) && ((TypeOfView == Rec_RECORD_LIST || TypeOfView == Rec_RECORD_PRINT) &&
(IAmTeacher || Gbl.Usrs.Listing.RecsUsrs == Rec_RECORD_USERS_TEACHERS))))); (IAmTeacher || Gbl.Usrs.Listing.RecsUsrs == Rec_RECORD_USERS_TEACHERS)))));
bool ShowID = (IAmDegAdmin || IAmSuperuser || DataForm || bool ShowID = (IAmDegAdmin || IAmSuperuser || DataForm ||
TypeOfView == Rec_FORM_MY_COMMON_RECORD || TypeOfView == Rec_FORM_MY_SHARE_RECORD ||
TypeOfView == Rec_MY_COMMON_RECORD_CHECK || TypeOfView == Rec_MY_SHARE_RECORD_CHECK ||
TypeOfView == Rec_FORM_MY_COURSE_RECORD || TypeOfView == Rec_FORM_MY_COURSE_RECORD ||
TypeOfView == Rec_MY_COURSE_RECORD_CHECK || TypeOfView == Rec_MY_COURSE_RECORD_CHECK ||
(UsrDat->Accepted && (UsrDat->Accepted &&
((TypeOfView == Rec_OTHER_USR_COMMON_RECORD_CHECK && ((TypeOfView == Rec_OTHER_USR_SHARE_RECORD_CHECK &&
!(IAmTeacher && HeIsTeacher)) || // A teacher can not see another teacher's ID !(IAmTeacher && HeIsTeacher)) || // A teacher can not see another teacher's ID
((TypeOfView == Rec_RECORD_LIST || TypeOfView == Rec_RECORD_PRINT) && ((TypeOfView == Rec_RECORD_LIST || TypeOfView == Rec_RECORD_PRINT) &&
IAmTeacher && Gbl.Usrs.Listing.RecsUsrs == Rec_RECORD_USERS_STUDENTS)))); IAmTeacher && Gbl.Usrs.Listing.RecsUsrs == Rec_RECORD_USERS_STUDENTS))));
@ -2073,8 +2073,8 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
switch (TypeOfView) switch (TypeOfView)
{ {
case Rec_FORM_SIGN_UP: case Rec_FORM_SIGN_UP:
case Rec_FORM_MY_COMMON_RECORD: case Rec_FORM_MY_SHARE_RECORD:
RecordWidth = Rec_WIDTH_COMMON_RECORD_BIG; RecordWidth = Rec_WIDTH_SHARE_RECORD_BIG;
FrameWidth = 10; FrameWidth = 10;
Col3Width = 160; Col3Width = 160;
ClassHead = "HEAD_REC"; ClassHead = "HEAD_REC";
@ -2093,17 +2093,17 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
Act_FormStart (ActUpdOthUsrDat); Act_FormStart (ActUpdOthUsrDat);
Usr_PutParamOtherUsrCodEncrypted (Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); // Existing user Usr_PutParamOtherUsrCodEncrypted (Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); // Existing user
} }
RecordWidth = Rec_WIDTH_COMMON_RECORD_BIG; RecordWidth = Rec_WIDTH_SHARE_RECORD_BIG;
FrameWidth = 10; FrameWidth = 10;
Col3Width = 160; Col3Width = 160;
ClassHead = "HEAD_REC"; ClassHead = "HEAD_REC";
ClassForm = The_ClassFormul[Gbl.Prefs.Theme]; ClassForm = The_ClassFormul[Gbl.Prefs.Theme];
ClassData = "DAT_REC"; ClassData = "DAT_REC";
break; break;
case Rec_MY_COMMON_RECORD_CHECK: case Rec_MY_SHARE_RECORD_CHECK:
case Rec_OTHER_USR_COMMON_RECORD_CHECK: case Rec_OTHER_USR_SHARE_RECORD_CHECK:
case Rec_RECORD_LIST: case Rec_RECORD_LIST:
RecordWidth = Rec_WIDTH_COMMON_RECORD_SMALL; RecordWidth = Rec_WIDTH_SHARE_RECORD_SMALL;
FrameWidth = 10; FrameWidth = 10;
Col3Width = 160; Col3Width = 160;
ClassHead = "HEAD_REC_SMALL"; ClassHead = "HEAD_REC_SMALL";
@ -2111,7 +2111,7 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
ClassData = "DAT_REC_SMALL_BOLD"; ClassData = "DAT_REC_SMALL_BOLD";
break; break;
case Rec_RECORD_PRINT: case Rec_RECORD_PRINT:
RecordWidth = Rec_WIDTH_COMMON_RECORD_PRINT; RecordWidth = Rec_WIDTH_SHARE_RECORD_PRINT;
FrameWidth = 1; FrameWidth = 1;
Col3Width = 160; Col3Width = 160;
ClassHead = "HEAD_REC_SMALL"; ClassHead = "HEAD_REC_SMALL";
@ -2164,7 +2164,7 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
/***** Button to admin user *****/ /***** Button to admin user *****/
if ((TypeOfView == Rec_RECORD_LIST || if ((TypeOfView == Rec_RECORD_LIST ||
TypeOfView == Rec_OTHER_USR_COMMON_RECORD_CHECK) && TypeOfView == Rec_OTHER_USR_SHARE_RECORD_CHECK) &&
(ItsMe || Gbl.Usrs.Me.LoggedRole >= Rol_ROLE_TEACHER)) (ItsMe || Gbl.Usrs.Me.LoggedRole >= Rol_ROLE_TEACHER))
{ {
Act_FormStart (ActReqMdfUsr); Act_FormStart (ActReqMdfUsr);
@ -2218,7 +2218,7 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
ShowPhoto = Pho_ShowUsrPhotoIsAllowed (UsrDat,PhotoURL); ShowPhoto = Pho_ShowUsrPhotoIsAllowed (UsrDat,PhotoURL);
fprintf (Gbl.F.Out,"<td rowspan=\"3\" class=\"%s\" style=\"width:%upx;" fprintf (Gbl.F.Out,"<td rowspan=\"3\" class=\"%s\" style=\"width:%upx;"
" text-align:center; vertical-align:top;\">", " text-align:center; vertical-align:top;\">",
TypeOfView == Rec_FORM_MY_COMMON_RECORD ? ClassForm : TypeOfView == Rec_FORM_MY_SHARE_RECORD ? ClassForm :
ClassData, ClassData,
Col3Width); Col3Width);
Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL : Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL :
@ -2229,14 +2229,14 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
if (ShowData) if (ShowData)
{ {
fprintf (Gbl.F.Out,"<br />"); fprintf (Gbl.F.Out,"<br />");
if (TypeOfView == Rec_FORM_MY_COMMON_RECORD) if (TypeOfView == Rec_FORM_MY_SHARE_RECORD)
{ {
fprintf (Gbl.F.Out,"<input type=\"checkbox\" name=\"PublicPhoto\" value=\"Y\""); fprintf (Gbl.F.Out,"<input type=\"checkbox\" name=\"PublicPhoto\" value=\"Y\"");
if (UsrDat->PublicPhoto) if (UsrDat->PublicPhoto)
fprintf (Gbl.F.Out," checked=\"checked\""); fprintf (Gbl.F.Out," checked=\"checked\"");
fprintf (Gbl.F.Out," /> %s",Txt_Public_photo); fprintf (Gbl.F.Out," /> %s",Txt_Public_photo);
} }
else if (TypeOfView == Rec_MY_COMMON_RECORD_CHECK) else if (TypeOfView == Rec_MY_SHARE_RECORD_CHECK)
fprintf (Gbl.F.Out,"%s", fprintf (Gbl.F.Out,"%s",
UsrDat->PublicPhoto ? Txt_Public_photo : UsrDat->PublicPhoto ? Txt_Public_photo :
Txt_Private_Photo); Txt_Private_Photo);
@ -2333,7 +2333,7 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
"<td class=\"%s\"" "<td class=\"%s\""
" style=\"width:%upx; text-align:left;\">", " style=\"width:%upx; text-align:left;\">",
ClassForm,Col1Width); ClassForm,Col1Width);
if (TypeOfView == Rec_FORM_MY_COMMON_RECORD) if (TypeOfView == Rec_FORM_MY_SHARE_RECORD)
fprintf (Gbl.F.Out,"%s*",Txt_Sex); fprintf (Gbl.F.Out,"%s*",Txt_Sex);
else else
fprintf (Gbl.F.Out,"%s",Txt_Role); fprintf (Gbl.F.Out,"%s",Txt_Role);
@ -2359,7 +2359,7 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
} }
fprintf (Gbl.F.Out,"</select>"); fprintf (Gbl.F.Out,"</select>");
break; break;
case Rec_FORM_MY_COMMON_RECORD: // It's me, change my data case Rec_FORM_MY_SHARE_RECORD: // It's me, change my data
for (Sex = Usr_SEX_FEMALE; for (Sex = Usr_SEX_FEMALE;
Sex <= Usr_SEX_MALE; Sex <= Usr_SEX_MALE;
Sex++) Sex++)
@ -2464,10 +2464,10 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
"</td>" "</td>"
"</tr>", "</tr>",
ClassForm,Col1Width, ClassForm,Col1Width,
TypeOfView == Rec_MY_COMMON_RECORD_CHECK ? Txt_Sex : TypeOfView == Rec_MY_SHARE_RECORD_CHECK ? Txt_Sex :
Txt_Role, Txt_Role,
ClassData,Col2Width, ClassData,Col2Width,
TypeOfView == Rec_MY_COMMON_RECORD_CHECK ? Txt_SEX_SINGULAR_Abc[UsrDat->Sex] : TypeOfView == Rec_MY_SHARE_RECORD_CHECK ? Txt_SEX_SINGULAR_Abc[UsrDat->Sex] :
Txt_ROLES_SINGULAR_Abc[UsrDat->RoleInCurrentCrsDB][UsrDat->Sex]); Txt_ROLES_SINGULAR_Abc[UsrDat->RoleInCurrentCrsDB][UsrDat->Sex]);
/***** Name *****/ /***** Name *****/
@ -2476,7 +2476,7 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
"<td class=\"%s\" style=\"width:%upx; text-align:left;\">" "<td class=\"%s\" style=\"width:%upx; text-align:left;\">"
"%s", "%s",
ClassForm,Col1Width,Txt_Surname_1); ClassForm,Col1Width,Txt_Surname_1);
if (TypeOfView == Rec_FORM_MY_COMMON_RECORD) if (TypeOfView == Rec_FORM_MY_SHARE_RECORD)
fprintf (Gbl.F.Out,"*"); fprintf (Gbl.F.Out,"*");
fprintf (Gbl.F.Out,":</td>" fprintf (Gbl.F.Out,":</td>"
"<td colspan=\"2\" class=\"%s\"" "<td colspan=\"2\" class=\"%s\""
@ -2516,7 +2516,7 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
"<td class=\"%s\" style=\"width:%upx; text-align:left;\">" "<td class=\"%s\" style=\"width:%upx; text-align:left;\">"
"%s", "%s",
ClassForm,Col1Width,Txt_First_name); ClassForm,Col1Width,Txt_First_name);
if (TypeOfView == Rec_FORM_MY_COMMON_RECORD) if (TypeOfView == Rec_FORM_MY_SHARE_RECORD)
fprintf (Gbl.F.Out,"*"); fprintf (Gbl.F.Out,"*");
fprintf (Gbl.F.Out,":</td>" fprintf (Gbl.F.Out,":</td>"
"<td class=\"%s\" colspan=\"2\"" "<td class=\"%s\" colspan=\"2\""
@ -2531,8 +2531,8 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
"</tr>"); "</tr>");
if (TypeOfView == Rec_FORM_MY_COMMON_RECORD || if (TypeOfView == Rec_FORM_MY_SHARE_RECORD ||
TypeOfView == Rec_MY_COMMON_RECORD_CHECK || TypeOfView == Rec_MY_SHARE_RECORD_CHECK ||
TypeOfView == Rec_FORM_MY_COURSE_RECORD || TypeOfView == Rec_FORM_MY_COURSE_RECORD ||
TypeOfView == Rec_MY_COURSE_RECORD_CHECK || TypeOfView == Rec_MY_COURSE_RECORD_CHECK ||
((TypeOfView == Rec_RECORD_LIST || ((TypeOfView == Rec_RECORD_LIST ||
@ -2547,7 +2547,7 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
" style=\"width:%upx; text-align:left;\">" " style=\"width:%upx; text-align:left;\">"
"%s", "%s",
ClassForm,Col1Width,Txt_Country); ClassForm,Col1Width,Txt_Country);
if (TypeOfView == Rec_FORM_MY_COMMON_RECORD) if (TypeOfView == Rec_FORM_MY_SHARE_RECORD)
fprintf (Gbl.F.Out,"*"); fprintf (Gbl.F.Out,"*");
fprintf (Gbl.F.Out,":</td>" fprintf (Gbl.F.Out,":</td>"
"<td colspan=\"2\" class=\"%s\"" "<td colspan=\"2\" class=\"%s\""
@ -2754,8 +2754,8 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
} }
/***** Institution, centre, department, office, etc. *****/ /***** Institution, centre, department, office, etc. *****/
if (((TypeOfView == Rec_FORM_MY_COMMON_RECORD || if (((TypeOfView == Rec_FORM_MY_SHARE_RECORD ||
TypeOfView == Rec_MY_COMMON_RECORD_CHECK || TypeOfView == Rec_MY_SHARE_RECORD_CHECK ||
TypeOfView == Rec_FORM_MY_COURSE_RECORD || TypeOfView == Rec_FORM_MY_COURSE_RECORD ||
TypeOfView == Rec_MY_COURSE_RECORD_CHECK) && TypeOfView == Rec_MY_COURSE_RECORD_CHECK) &&
(UsrDat->Roles & (1 << Rol_ROLE_TEACHER))) || // He/she (me, really) is a teacher in any course (UsrDat->Roles & (1 << Rol_ROLE_TEACHER))) || // He/she (me, really) is a teacher in any course

16
swad_record.h
View File

@ -35,11 +35,11 @@
/***************************** Public constants ******************************/ /***************************** Public constants ******************************/
/*****************************************************************************/ /*****************************************************************************/
#define Rec_WIDTH_COMMON_RECORD_BIG 580 #define Rec_WIDTH_SHARE_RECORD_BIG 580
#define Rec_WIDTH_COMMON_RECORD_SMALL 540 #define Rec_WIDTH_SHARE_RECORD_SMALL 540
#define Rec_WIDTH_COMMON_RECORD_PRINT 540 #define Rec_WIDTH_SHARE_RECORD_PRINT 540
#define Rec_WIDTH_COURSE_RECORD Rec_WIDTH_COMMON_RECORD_SMALL #define Rec_WIDTH_COURSE_RECORD Rec_WIDTH_SHARE_RECORD_SMALL
#define Rec_WIDTH_COURSE_RECORD_PRINT Rec_WIDTH_COMMON_RECORD_PRINT #define Rec_WIDTH_COURSE_RECORD_PRINT Rec_WIDTH_SHARE_RECORD_PRINT
#define Rec_MAX_LENGTH_NAME_FIELD 255 #define Rec_MAX_LENGTH_NAME_FIELD 255
#define Rec_MIN_LINES_IN_EDITION_FIELD 1 #define Rec_MIN_LINES_IN_EDITION_FIELD 1
@ -52,11 +52,11 @@
typedef enum typedef enum
{ {
Rec_FORM_SIGN_UP, Rec_FORM_SIGN_UP,
Rec_FORM_MY_COMMON_RECORD, Rec_FORM_MY_SHARE_RECORD,
Rec_FORM_MODIFY_RECORD_OTHER_EXISTING_USR, Rec_FORM_MODIFY_RECORD_OTHER_EXISTING_USR,
Rec_FORM_NEW_RECORD_OTHER_NEW_USR, Rec_FORM_NEW_RECORD_OTHER_NEW_USR,
Rec_MY_COMMON_RECORD_CHECK, Rec_MY_SHARE_RECORD_CHECK,
Rec_OTHER_USR_COMMON_RECORD_CHECK, Rec_OTHER_USR_SHARE_RECORD_CHECK,
Rec_FORM_MY_COURSE_RECORD, Rec_FORM_MY_COURSE_RECORD,
Rec_MY_COURSE_RECORD_CHECK, Rec_MY_COURSE_RECORD_CHECK,
Rec_OTHER_USR_COURSE_RECORD_CHECK, Rec_OTHER_USR_COURSE_RECORD_CHECK,

70
swad_search.c
View File

@ -210,7 +210,7 @@ static void Sch_PutFormToSearchWithWhatToSearchAndScope (Act_Action_t Action,Sco
extern const char *Txt_Courses; extern const char *Txt_Courses;
extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS]; extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
extern const char *Txt_My_documents; extern const char *Txt_My_documents;
extern const char *Txt_Documents_in_my_courses; extern const char *Txt_DOCUM_in_my_courses;
extern const char *Txt_Open_documents; extern const char *Txt_Open_documents;
extern const char *Txt_Search; extern const char *Txt_Search;
const char *Titles[Sch_NUM_WHAT_TO_SEARCH] = const char *Titles[Sch_NUM_WHAT_TO_SEARCH] =
@ -224,7 +224,7 @@ static void Sch_PutFormToSearchWithWhatToSearchAndScope (Act_Action_t Action,Sco
Txt_ROLES_PLURAL_Abc[Rol_ROLE_STUDENT][Usr_SEX_UNKNOWN],// Sch_SEARCH_STUDENTS Txt_ROLES_PLURAL_Abc[Rol_ROLE_STUDENT][Usr_SEX_UNKNOWN],// Sch_SEARCH_STUDENTS
Txt_ROLES_PLURAL_Abc[Rol_ROLE_GUEST ][Usr_SEX_UNKNOWN],// Sch_SEARCH_GUESTS Txt_ROLES_PLURAL_Abc[Rol_ROLE_GUEST ][Usr_SEX_UNKNOWN],// Sch_SEARCH_GUESTS
Txt_Open_documents, // Sch_SEARCH_OPEN_DOCUMENTS Txt_Open_documents, // Sch_SEARCH_OPEN_DOCUMENTS
Txt_Documents_in_my_courses, // Sch_SEARCH_DOCUMENTS_IN_MY_COURSES Txt_DOCUM_in_my_courses, // Sch_SEARCH_DOCUM_IN_MY_COURSES
Txt_My_documents, // Sch_SEARCH_MY_DOCUMENTS Txt_My_documents, // Sch_SEARCH_MY_DOCUMENTS
}; };
Sch_WhatToSearch_t WhatToSearch; Sch_WhatToSearch_t WhatToSearch;
@ -300,7 +300,7 @@ static bool Sch_CheckIfIHavePermissionToSearch (Sch_WhatToSearch_t WhatToSearch)
0x100, // Sch_SEARCH_STUDENTS Only for superusers 0x100, // Sch_SEARCH_STUDENTS Only for superusers
0x100, // Sch_SEARCH_GUESTS Only for superusers 0x100, // Sch_SEARCH_GUESTS Only for superusers
0x1FF, // Sch_SEARCH_OPEN_DOCUMENTS 0x1FF, // Sch_SEARCH_OPEN_DOCUMENTS
0x1FE, // Sch_SEARCH_DOCUMENTS_IN_MY_COURSES Only if I am logged 0x1FE, // Sch_SEARCH_DOCUM_IN_MY_COURSES Only if I am logged
0x1FE, // Sch_SEARCH_MY_DOCUMENTS Only if I am logged 0x1FE, // Sch_SEARCH_MY_DOCUMENTS Only if I am logged
}; };
@ -571,7 +571,7 @@ static void Sch_SearchInDB (void)
case Sch_SEARCH_OPEN_DOCUMENTS: case Sch_SEARCH_OPEN_DOCUMENTS:
NumResults = Sch_SearchOpenDocumentsInDB (RangeQuery); NumResults = Sch_SearchOpenDocumentsInDB (RangeQuery);
break; break;
case Sch_SEARCH_DOCUMENTS_IN_MY_COURSES: case Sch_SEARCH_DOCUM_IN_MY_COURSES:
NumResults = Sch_SearchDocumentsInMyCoursesInDB (RangeQuery); NumResults = Sch_SearchDocumentsInMyCoursesInDB (RangeQuery);
break; break;
case Sch_SEARCH_MY_DOCUMENTS: case Sch_SEARCH_MY_DOCUMENTS:
@ -825,17 +825,17 @@ 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_FILE_BRW_ADMIN_DOCUMENTS_INS, (unsigned) Brw_ADMI_DOCUM_INS,
RangeQuery, RangeQuery,
SearchQuery, SearchQuery,
(unsigned) Brw_FILE_BRW_ADMIN_DOCUMENTS_CTR, (unsigned) Brw_ADMI_DOCUM_CTR,
RangeQuery, RangeQuery,
SearchQuery, SearchQuery,
(unsigned) Brw_FILE_BRW_ADMIN_DOCUMENTS_DEG, (unsigned) Brw_ADMI_DOCUM_DEG,
RangeQuery, RangeQuery,
SearchQuery, SearchQuery,
(unsigned) Brw_FILE_BRW_ADMIN_DOCUMENTS_CRS, (unsigned) Brw_ADMI_DOCUM_CRS,
(unsigned) Brw_FILE_BRW_COMMON_CRS, (unsigned) Brw_ADMI_SHARE_CRS,
RangeQuery); RangeQuery);
/***** Query database and list documents found *****/ /***** Query database and list documents found *****/
@ -853,13 +853,13 @@ static unsigned Sch_SearchOpenDocumentsInDB (const char *RangeQuery)
static unsigned Sch_SearchDocumentsInMyCoursesInDB (const char *RangeQuery) static unsigned Sch_SearchDocumentsInMyCoursesInDB (const char *RangeQuery)
{ {
extern const char *Txt_Documents_in_my_courses; extern const char *Txt_DOCUM_in_my_courses;
char SearchQuery[Sch_MAX_LENGTH_SEARCH_QUERY+1]; char SearchQuery[Sch_MAX_LENGTH_SEARCH_QUERY+1];
char Query[(512+Sch_MAX_LENGTH_SEARCH_QUERY)*2]; char Query[(512+Sch_MAX_LENGTH_SEARCH_QUERY)*2];
unsigned NumDocs; unsigned NumDocs;
/***** Check user's permission *****/ /***** Check user's permission *****/
if (Sch_CheckIfIHavePermissionToSearch (Sch_SEARCH_DOCUMENTS_IN_MY_COURSES)) if (Sch_CheckIfIHavePermissionToSearch (Sch_SEARCH_DOCUM_IN_MY_COURSES))
/***** Split document string into words *****/ /***** Split document string into words *****/
if (Sch_BuildSearchQuery (SearchQuery,"SUBSTRING_INDEX(files.Path,'/',-1)", if (Sch_BuildSearchQuery (SearchQuery,"SUBSTRING_INDEX(files.Path,'/',-1)",
"_latin1 "," COLLATE latin1_general_ci")) "_latin1 "," COLLATE latin1_general_ci"))
@ -872,9 +872,9 @@ 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')", " AND files.FileBrowser IN ('%u','%u','%u')",
Gbl.Usrs.Me.UsrDat.UsrCod, Gbl.Usrs.Me.UsrDat.UsrCod,
(unsigned) Brw_FILE_BRW_ADMIN_DOCUMENTS_CRS, (unsigned) Brw_ADMI_DOCUM_CRS,
(unsigned) Brw_FILE_BRW_COMMON_CRS, (unsigned) Brw_ADMI_SHARE_CRS,
(unsigned) Brw_FILE_BRW_ADMIN_MARKS_CRS); (unsigned) Brw_ADMI_MARKS_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");
sprintf (Query,"CREATE TEMPORARY TABLE my_files_grp (FilCod INT NOT NULL,UNIQUE INDEX(FilCod)) ENGINE=MEMORY" sprintf (Query,"CREATE TEMPORARY TABLE my_files_grp (FilCod INT NOT NULL,UNIQUE INDEX(FilCod)) ENGINE=MEMORY"
@ -883,9 +883,9 @@ 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')", " AND files.FileBrowser IN ('%u','%u','%u')",
Gbl.Usrs.Me.UsrDat.UsrCod, Gbl.Usrs.Me.UsrDat.UsrCod,
(unsigned) Brw_FILE_BRW_ADMIN_DOCUMENTS_GRP, (unsigned) Brw_ADMI_DOCUM_GRP,
(unsigned) Brw_FILE_BRW_COMMON_GRP, (unsigned) Brw_ADMI_SHARE_GRP,
(unsigned) Brw_FILE_BRW_ADMIN_MARKS_GRP); (unsigned) Brw_ADMI_MARKS_GRP);
/* if (Gbl.Usrs.Me.LoggedRole == Rol_ROLE_SUPERUSER) /* if (Gbl.Usrs.Me.LoggedRole == Rol_ROLE_SUPERUSER)
Lay_ShowAlert (Lay_INFO,Query); */ Lay_ShowAlert (Lay_INFO,Query); */
if (mysql_query (&Gbl.mysql,Query)) if (mysql_query (&Gbl.mysql,Query))
@ -933,20 +933,20 @@ 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_FILE_BRW_ADMIN_DOCUMENTS_CRS, (unsigned) Brw_ADMI_DOCUM_CRS,
(unsigned) Brw_FILE_BRW_COMMON_CRS, (unsigned) Brw_ADMI_SHARE_CRS,
(unsigned) Brw_FILE_BRW_ADMIN_MARKS_CRS, (unsigned) Brw_ADMI_MARKS_CRS,
RangeQuery, RangeQuery,
SearchQuery, SearchQuery,
(unsigned) Brw_FILE_BRW_ADMIN_DOCUMENTS_GRP, (unsigned) Brw_ADMI_DOCUM_GRP,
(unsigned) Brw_FILE_BRW_COMMON_GRP, (unsigned) Brw_ADMI_SHARE_GRP,
(unsigned) Brw_FILE_BRW_ADMIN_MARKS_GRP, (unsigned) Brw_ADMI_MARKS_GRP,
RangeQuery); RangeQuery);
/***** Query database and list documents found *****/ /***** Query database and list documents found *****/
/* if (Gbl.Usrs.Me.LoggedRole == Rol_ROLE_SUPERUSER) /* if (Gbl.Usrs.Me.LoggedRole == Rol_ROLE_SUPERUSER)
Lay_ShowAlert (Lay_INFO,Query); */ Lay_ShowAlert (Lay_INFO,Query); */
NumDocs = Brw_ListDocsFound (Query,Txt_Documents_in_my_courses); NumDocs = Brw_ListDocsFound (Query,Txt_DOCUM_in_my_courses);
/***** Drop temporary table *****/ /***** Drop temporary table *****/
sprintf (Query,"DROP TEMPORARY TABLE IF EXISTS my_files_crs,my_files_grp"); sprintf (Query,"DROP TEMPORARY TABLE IF EXISTS my_files_crs,my_files_grp");
@ -1073,26 +1073,26 @@ 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_FILE_BRW_ADMIN_DOCUMENTS_INS, (unsigned) Brw_ADMI_DOCUM_INS,
RangeQuery, RangeQuery,
Gbl.Usrs.Me.UsrDat.UsrCod,SearchQuery, Gbl.Usrs.Me.UsrDat.UsrCod,SearchQuery,
(unsigned) Brw_FILE_BRW_ADMIN_DOCUMENTS_CTR, (unsigned) Brw_ADMI_DOCUM_CTR,
RangeQuery, RangeQuery,
Gbl.Usrs.Me.UsrDat.UsrCod,SearchQuery, Gbl.Usrs.Me.UsrDat.UsrCod,SearchQuery,
(unsigned) Brw_FILE_BRW_ADMIN_DOCUMENTS_DEG, (unsigned) Brw_ADMI_DOCUM_DEG,
RangeQuery, RangeQuery,
Gbl.Usrs.Me.UsrDat.UsrCod,SearchQuery, Gbl.Usrs.Me.UsrDat.UsrCod,SearchQuery,
(unsigned) Brw_FILE_BRW_ADMIN_DOCUMENTS_CRS, (unsigned) Brw_ADMI_DOCUM_CRS,
(unsigned) Brw_FILE_BRW_COMMON_CRS, (unsigned) Brw_ADMI_SHARE_CRS,
(unsigned) Brw_FILE_BRW_ADMIN_MARKS_CRS, (unsigned) Brw_ADMI_MARKS_CRS,
RangeQuery, RangeQuery,
Gbl.Usrs.Me.UsrDat.UsrCod,SearchQuery, Gbl.Usrs.Me.UsrDat.UsrCod,SearchQuery,
(unsigned) Brw_FILE_BRW_ADMIN_DOCUMENTS_GRP, (unsigned) Brw_ADMI_DOCUM_GRP,
(unsigned) Brw_FILE_BRW_COMMON_GRP, (unsigned) Brw_ADMI_SHARE_GRP,
(unsigned) Brw_FILE_BRW_ADMIN_MARKS_GRP, (unsigned) Brw_ADMI_MARKS_GRP,
RangeQuery, RangeQuery,
Gbl.Usrs.Me.UsrDat.UsrCod,SearchQuery, Gbl.Usrs.Me.UsrDat.UsrCod,SearchQuery,
(unsigned) Brw_FILE_BRW_BRIEFCASE_USR); (unsigned) Brw_ADMI_BRIEF_USR);
/***** Query database and list documents found *****/ /***** Query database and list documents found *****/
/* if (Gbl.Usrs.Me.LoggedRole == Rol_ROLE_SUPERUSER) /* if (Gbl.Usrs.Me.LoggedRole == Rol_ROLE_SUPERUSER)
@ -1134,7 +1134,7 @@ static bool Sch_BuildSearchQuery (char *SearchQuery,const char *FieldName,
switch (Gbl.Search.WhatToSearch) switch (Gbl.Search.WhatToSearch)
{ {
case Sch_SEARCH_OPEN_DOCUMENTS: case Sch_SEARCH_OPEN_DOCUMENTS:
case Sch_SEARCH_DOCUMENTS_IN_MY_COURSES: case Sch_SEARCH_DOCUM_IN_MY_COURSES:
case Sch_SEARCH_MY_DOCUMENTS: case Sch_SEARCH_MY_DOCUMENTS:
SearchWordIsValid = Str_ConvertFilFolLnkNameToValid (SearchWord); SearchWordIsValid = Str_ConvertFilFolLnkNameToValid (SearchWord);
break; break;

2
swad_search.h
View File

@ -49,7 +49,7 @@ typedef enum
Sch_SEARCH_STUDENTS = 6, Sch_SEARCH_STUDENTS = 6,
Sch_SEARCH_GUESTS = 7, Sch_SEARCH_GUESTS = 7,
Sch_SEARCH_OPEN_DOCUMENTS = 8, Sch_SEARCH_OPEN_DOCUMENTS = 8,
Sch_SEARCH_DOCUMENTS_IN_MY_COURSES = 9, Sch_SEARCH_DOCUM_IN_MY_COURSES = 9,
Sch_SEARCH_MY_DOCUMENTS = 10, Sch_SEARCH_MY_DOCUMENTS = 10,
} Sch_WhatToSearch_t; } Sch_WhatToSearch_t;

82
swad_statistic.c
View File

@ -4462,15 +4462,15 @@ static void Sta_GetAndShowFileBrowsersStats (void)
extern const char *Txt_Virtual_pendrives; extern const char *Txt_Virtual_pendrives;
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_FILE_BRW_ADMIN_DOCUMENTS_CRS, Brw_ADMI_DOCUM_CRS,
Brw_FILE_BRW_ADMIN_DOCUMENTS_GRP, Brw_ADMI_DOCUM_GRP,
Brw_FILE_BRW_COMMON_CRS, Brw_ADMI_SHARE_CRS,
Brw_FILE_BRW_COMMON_GRP, Brw_ADMI_SHARE_GRP,
Brw_FILE_BRW_ADMIN_MARKS_CRS, Brw_ADMI_MARKS_CRS,
Brw_FILE_BRW_ADMIN_MARKS_GRP, Brw_ADMI_MARKS_GRP,
Brw_FILE_BRW_ASSIGNMENTS_USR, Brw_ADMI_ASSIG_USR,
Brw_FILE_BRW_WORKS_USR, Brw_ADMI_WORKS_USR,
Brw_FILE_BRW_UNKNOWN, Brw_UNKNOWN,
}; };
unsigned NumStat; unsigned NumStat;
@ -4490,7 +4490,7 @@ static void Sta_GetAndShowFileBrowsersStats (void)
Sta_WriteStatsExpTreesTableHead (); Sta_WriteStatsExpTreesTableHead ();
/***** Write size of briefcases *****/ /***** Write size of briefcases *****/
Sta_WriteRowStatsExpTrees (Brw_FILE_BRW_BRIEFCASE_USR,Txt_Virtual_pendrives); Sta_WriteRowStatsExpTrees (Brw_ADMI_BRIEF_USR,Txt_Virtual_pendrives);
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 ();
@ -4582,9 +4582,9 @@ static void Sta_WriteRowStatsExpTrees (Brw_FileBrowser_t FileZone,const char *Na
char StrNumFilesPerCrs[10+1]; char StrNumFilesPerCrs[10+1];
char StrNumFilesPerUsr[10+1]; char StrNumFilesPerUsr[10+1];
struct Sta_SizeOfFileZones SizeOfFileZones; struct Sta_SizeOfFileZones SizeOfFileZones;
char *ClassData = (FileZone == Brw_FILE_BRW_UNKNOWN) ? "DAT_N" : char *ClassData = (FileZone == Brw_UNKNOWN) ? "DAT_N" :
"DAT"; "DAT";
char *StyleTableCell = (FileZone == Brw_FILE_BRW_UNKNOWN) ? " border-style:solid none none none;" char *StyleTableCell = (FileZone == Brw_UNKNOWN) ? " border-style:solid none none none;"
" border-width:1px;" : " border-width:1px;" :
""; "";
@ -4705,18 +4705,18 @@ static void Sta_GetSizeOfFileZoneFromDB (Sco_Scope_t Scope,Brw_FileBrowser_t Fil
switch (Scope) switch (Scope)
{ {
case Sco_SCOPE_PLATFORM: case Sco_SCOPE_PLATFORM:
if (FileBrowser == Brw_FILE_BRW_UNKNOWN) if (FileBrowser == Brw_UNKNOWN)
sprintf (Query,"SELECT COUNT(DISTINCT CrsCod),'-1',MAX(NumLevels),SUM(NumFolders),SUM(NumFiles),SUM(TotalSize)" sprintf (Query,"SELECT COUNT(DISTINCT CrsCod),'-1',MAX(NumLevels),SUM(NumFolders),SUM(NumFiles),SUM(TotalSize)"
" FROM file_browser_size" " FROM file_browser_size"
" WHERE FileBrowser<>'%u'", " WHERE FileBrowser<>'%u'",
(unsigned) Brw_FILE_BRW_BRIEFCASE_USR); (unsigned) Brw_ADMI_BRIEF_USR);
else if (FileBrowser == Brw_FILE_BRW_BRIEFCASE_USR) else if (FileBrowser == Brw_ADMI_BRIEF_USR)
sprintf (Query,"SELECT '-1',COUNT(DISTINCT UsrCod),MAX(NumLevels),SUM(NumFolders),SUM(NumFiles),SUM(TotalSize)" sprintf (Query,"SELECT '-1',COUNT(DISTINCT UsrCod),MAX(NumLevels),SUM(NumFolders),SUM(NumFiles),SUM(TotalSize)"
" FROM file_browser_size" " FROM file_browser_size"
" WHERE FileBrowser='%u'", " WHERE FileBrowser='%u'",
(unsigned) FileBrowser); (unsigned) FileBrowser);
else if (FileBrowser == Brw_FILE_BRW_ASSIGNMENTS_USR || else if (FileBrowser == Brw_ADMI_ASSIG_USR ||
FileBrowser == Brw_FILE_BRW_WORKS_USR) FileBrowser == Brw_ADMI_WORKS_USR)
sprintf (Query,"SELECT COUNT(DISTINCT CrsCod),COUNT(DISTINCT UsrCod),MAX(NumLevels),SUM(NumFolders),SUM(NumFiles),SUM(TotalSize)" sprintf (Query,"SELECT COUNT(DISTINCT CrsCod),COUNT(DISTINCT UsrCod),MAX(NumLevels),SUM(NumFolders),SUM(NumFiles),SUM(TotalSize)"
" FROM file_browser_size" " FROM file_browser_size"
" WHERE FileBrowser='%u'", " WHERE FileBrowser='%u'",
@ -4728,7 +4728,7 @@ static void Sta_GetSizeOfFileZoneFromDB (Sco_Scope_t Scope,Brw_FileBrowser_t Fil
(unsigned) FileBrowser); (unsigned) FileBrowser);
break; break;
case Sco_SCOPE_INSTITUTION: case Sco_SCOPE_INSTITUTION:
if (FileBrowser == Brw_FILE_BRW_UNKNOWN) if (FileBrowser == Brw_UNKNOWN)
sprintf (Query,"SELECT COUNT(DISTINCT file_browser_size.CrsCod),'-1',MAX(file_browser_size.NumLevels),SUM(file_browser_size.NumFolders),SUM(file_browser_size.NumFiles),SUM(file_browser_size.TotalSize)" sprintf (Query,"SELECT COUNT(DISTINCT file_browser_size.CrsCod),'-1',MAX(file_browser_size.NumLevels),SUM(file_browser_size.NumFolders),SUM(file_browser_size.NumFiles),SUM(file_browser_size.TotalSize)"
" FROM centres,degrees,courses,file_browser_size" " FROM centres,degrees,courses,file_browser_size"
" WHERE centres.InsCod='%ld'" " WHERE centres.InsCod='%ld'"
@ -4736,7 +4736,7 @@ static void Sta_GetSizeOfFileZoneFromDB (Sco_Scope_t Scope,Brw_FileBrowser_t Fil
" AND degrees.DegCod=courses.DegCod" " AND degrees.DegCod=courses.DegCod"
" AND courses.CrsCod=file_browser_size.CrsCod", " AND courses.CrsCod=file_browser_size.CrsCod",
Gbl.CurrentIns.Ins.InsCod); Gbl.CurrentIns.Ins.InsCod);
else if (FileBrowser == Brw_FILE_BRW_BRIEFCASE_USR) else if (FileBrowser == Brw_ADMI_BRIEF_USR)
sprintf (Query,"SELECT '-1',COUNT(DISTINCT file_browser_size.UsrCod),MAX(file_browser_size.NumLevels),SUM(file_browser_size.NumFolders),SUM(file_browser_size.NumFiles),SUM(file_browser_size.TotalSize)" sprintf (Query,"SELECT '-1',COUNT(DISTINCT file_browser_size.UsrCod),MAX(file_browser_size.NumLevels),SUM(file_browser_size.NumFolders),SUM(file_browser_size.NumFiles),SUM(file_browser_size.TotalSize)"
" FROM file_browser_size,centres,degrees,courses,crs_usr" " FROM file_browser_size,centres,degrees,courses,crs_usr"
" WHERE file_browser_size.FileBrowser='%u'" " WHERE file_browser_size.FileBrowser='%u'"
@ -4746,8 +4746,8 @@ static void Sta_GetSizeOfFileZoneFromDB (Sco_Scope_t Scope,Brw_FileBrowser_t Fil
" AND courses.CrsCod=crs_usr.CrsCod" " AND courses.CrsCod=crs_usr.CrsCod"
" AND file_browser_size.UsrCod=crs_usr.UsrCod", " AND file_browser_size.UsrCod=crs_usr.UsrCod",
(unsigned) FileBrowser,Gbl.CurrentIns.Ins.InsCod); (unsigned) FileBrowser,Gbl.CurrentIns.Ins.InsCod);
else if (FileBrowser == Brw_FILE_BRW_ASSIGNMENTS_USR || else if (FileBrowser == Brw_ADMI_ASSIG_USR ||
FileBrowser == Brw_FILE_BRW_WORKS_USR) FileBrowser == Brw_ADMI_WORKS_USR)
sprintf (Query,"SELECT COUNT(DISTINCT file_browser_size.CrsCod),COUNT(DISTINCT file_browser_size.UsrCod),MAX(file_browser_size.NumLevels),SUM(file_browser_size.NumFolders),SUM(file_browser_size.NumFiles),SUM(file_browser_size.TotalSize)" sprintf (Query,"SELECT COUNT(DISTINCT file_browser_size.CrsCod),COUNT(DISTINCT file_browser_size.UsrCod),MAX(file_browser_size.NumLevels),SUM(file_browser_size.NumFolders),SUM(file_browser_size.NumFiles),SUM(file_browser_size.TotalSize)"
" FROM file_browser_size,centres,degrees,courses" " FROM file_browser_size,centres,degrees,courses"
" WHERE file_browser_size.FileBrowser='%u'" " WHERE file_browser_size.FileBrowser='%u'"
@ -4767,14 +4767,14 @@ static void Sta_GetSizeOfFileZoneFromDB (Sco_Scope_t Scope,Brw_FileBrowser_t Fil
(unsigned) FileBrowser,Gbl.CurrentIns.Ins.InsCod); (unsigned) FileBrowser,Gbl.CurrentIns.Ins.InsCod);
break; break;
case Sco_SCOPE_CENTRE: case Sco_SCOPE_CENTRE:
if (FileBrowser == Brw_FILE_BRW_UNKNOWN) if (FileBrowser == Brw_UNKNOWN)
sprintf (Query,"SELECT COUNT(DISTINCT file_browser_size.CrsCod),'-1',MAX(file_browser_size.NumLevels),SUM(file_browser_size.NumFolders),SUM(file_browser_size.NumFiles),SUM(file_browser_size.TotalSize)" sprintf (Query,"SELECT COUNT(DISTINCT file_browser_size.CrsCod),'-1',MAX(file_browser_size.NumLevels),SUM(file_browser_size.NumFolders),SUM(file_browser_size.NumFiles),SUM(file_browser_size.TotalSize)"
" FROM degrees,courses,file_browser_size" " FROM degrees,courses,file_browser_size"
" WHERE degrees.CtrCod='%ld'" " WHERE degrees.CtrCod='%ld'"
" AND degrees.DegCod=courses.DegCod" " AND degrees.DegCod=courses.DegCod"
" AND courses.CrsCod=file_browser_size.CrsCod", " AND courses.CrsCod=file_browser_size.CrsCod",
Gbl.CurrentCtr.Ctr.CtrCod); Gbl.CurrentCtr.Ctr.CtrCod);
else if (FileBrowser == Brw_FILE_BRW_BRIEFCASE_USR) else if (FileBrowser == Brw_ADMI_BRIEF_USR)
sprintf (Query,"SELECT '-1',COUNT(DISTINCT file_browser_size.UsrCod),MAX(file_browser_size.NumLevels),SUM(file_browser_size.NumFolders),SUM(file_browser_size.NumFiles),SUM(file_browser_size.TotalSize)" sprintf (Query,"SELECT '-1',COUNT(DISTINCT file_browser_size.UsrCod),MAX(file_browser_size.NumLevels),SUM(file_browser_size.NumFolders),SUM(file_browser_size.NumFiles),SUM(file_browser_size.TotalSize)"
" FROM file_browser_size,degrees,courses,crs_usr" " FROM file_browser_size,degrees,courses,crs_usr"
" WHERE file_browser_size.FileBrowser='%u'" " WHERE file_browser_size.FileBrowser='%u'"
@ -4783,8 +4783,8 @@ static void Sta_GetSizeOfFileZoneFromDB (Sco_Scope_t Scope,Brw_FileBrowser_t Fil
" AND courses.CrsCod=crs_usr.CrsCod" " AND courses.CrsCod=crs_usr.CrsCod"
" AND file_browser_size.UsrCod=crs_usr.UsrCod", " AND file_browser_size.UsrCod=crs_usr.UsrCod",
(unsigned) FileBrowser,Gbl.CurrentCtr.Ctr.CtrCod); (unsigned) FileBrowser,Gbl.CurrentCtr.Ctr.CtrCod);
else if (FileBrowser == Brw_FILE_BRW_ASSIGNMENTS_USR || else if (FileBrowser == Brw_ADMI_ASSIG_USR ||
FileBrowser == Brw_FILE_BRW_WORKS_USR) FileBrowser == Brw_ADMI_WORKS_USR)
sprintf (Query,"SELECT COUNT(DISTINCT file_browser_size.CrsCod),COUNT(DISTINCT file_browser_size.UsrCod),MAX(file_browser_size.NumLevels),SUM(file_browser_size.NumFolders),SUM(file_browser_size.NumFiles),SUM(file_browser_size.TotalSize)" sprintf (Query,"SELECT COUNT(DISTINCT file_browser_size.CrsCod),COUNT(DISTINCT file_browser_size.UsrCod),MAX(file_browser_size.NumLevels),SUM(file_browser_size.NumFolders),SUM(file_browser_size.NumFiles),SUM(file_browser_size.TotalSize)"
" FROM file_browser_size,degrees,courses" " FROM file_browser_size,degrees,courses"
" WHERE file_browser_size.FileBrowser='%u'" " WHERE file_browser_size.FileBrowser='%u'"
@ -4802,12 +4802,12 @@ static void Sta_GetSizeOfFileZoneFromDB (Sco_Scope_t Scope,Brw_FileBrowser_t Fil
(unsigned) FileBrowser,Gbl.CurrentCtr.Ctr.CtrCod); (unsigned) FileBrowser,Gbl.CurrentCtr.Ctr.CtrCod);
break; break;
case Sco_SCOPE_DEGREE: case Sco_SCOPE_DEGREE:
if (FileBrowser == Brw_FILE_BRW_UNKNOWN) if (FileBrowser == Brw_UNKNOWN)
sprintf (Query,"SELECT COUNT(DISTINCT file_browser_size.CrsCod),'-1',MAX(file_browser_size.NumLevels),SUM(file_browser_size.NumFolders),SUM(file_browser_size.NumFiles),SUM(file_browser_size.TotalSize)" sprintf (Query,"SELECT COUNT(DISTINCT file_browser_size.CrsCod),'-1',MAX(file_browser_size.NumLevels),SUM(file_browser_size.NumFolders),SUM(file_browser_size.NumFiles),SUM(file_browser_size.TotalSize)"
" FROM file_browser_size,courses" " FROM file_browser_size,courses"
" WHERE courses.DegCod='%ld' AND courses.CrsCod=file_browser_size.CrsCod", " WHERE courses.DegCod='%ld' AND courses.CrsCod=file_browser_size.CrsCod",
Gbl.CurrentDeg.Deg.DegCod); Gbl.CurrentDeg.Deg.DegCod);
else if (FileBrowser == Brw_FILE_BRW_BRIEFCASE_USR) else if (FileBrowser == Brw_ADMI_BRIEF_USR)
sprintf (Query,"SELECT '-1',COUNT(DISTINCT file_browser_size.UsrCod),MAX(file_browser_size.NumLevels),SUM(file_browser_size.NumFolders),SUM(file_browser_size.NumFiles),SUM(file_browser_size.TotalSize)" sprintf (Query,"SELECT '-1',COUNT(DISTINCT file_browser_size.UsrCod),MAX(file_browser_size.NumLevels),SUM(file_browser_size.NumFolders),SUM(file_browser_size.NumFiles),SUM(file_browser_size.TotalSize)"
" FROM file_browser_size,courses,crs_usr" " FROM file_browser_size,courses,crs_usr"
" WHERE file_browser_size.FileBrowser='%u'" " WHERE file_browser_size.FileBrowser='%u'"
@ -4815,8 +4815,8 @@ static void Sta_GetSizeOfFileZoneFromDB (Sco_Scope_t Scope,Brw_FileBrowser_t Fil
" AND courses.CrsCod=crs_usr.CrsCod" " AND courses.CrsCod=crs_usr.CrsCod"
" AND file_browser_size.UsrCod=crs_usr.UsrCod", " AND file_browser_size.UsrCod=crs_usr.UsrCod",
(unsigned) FileBrowser,Gbl.CurrentDeg.Deg.DegCod); (unsigned) FileBrowser,Gbl.CurrentDeg.Deg.DegCod);
else if (FileBrowser == Brw_FILE_BRW_ASSIGNMENTS_USR || else if (FileBrowser == Brw_ADMI_ASSIG_USR ||
FileBrowser == Brw_FILE_BRW_WORKS_USR) FileBrowser == Brw_ADMI_WORKS_USR)
sprintf (Query,"SELECT COUNT(DISTINCT file_browser_size.CrsCod),COUNT(DISTINCT file_browser_size.UsrCod),MAX(file_browser_size.NumLevels),SUM(file_browser_size.NumFolders),SUM(file_browser_size.NumFiles),SUM(file_browser_size.TotalSize)" sprintf (Query,"SELECT COUNT(DISTINCT file_browser_size.CrsCod),COUNT(DISTINCT file_browser_size.UsrCod),MAX(file_browser_size.NumLevels),SUM(file_browser_size.NumFolders),SUM(file_browser_size.NumFiles),SUM(file_browser_size.TotalSize)"
" FROM file_browser_size,courses" " FROM file_browser_size,courses"
" WHERE file_browser_size.FileBrowser='%u'" " WHERE file_browser_size.FileBrowser='%u'"
@ -4832,20 +4832,20 @@ static void Sta_GetSizeOfFileZoneFromDB (Sco_Scope_t Scope,Brw_FileBrowser_t Fil
(unsigned) FileBrowser,Gbl.CurrentDeg.Deg.DegCod); (unsigned) FileBrowser,Gbl.CurrentDeg.Deg.DegCod);
break; break;
case Sco_SCOPE_COURSE: case Sco_SCOPE_COURSE:
if (FileBrowser == Brw_FILE_BRW_UNKNOWN) if (FileBrowser == Brw_UNKNOWN)
sprintf (Query,"SELECT '1','-1',MAX(NumLevels),SUM(NumFolders),SUM(NumFiles),SUM(TotalSize)" sprintf (Query,"SELECT '1','-1',MAX(NumLevels),SUM(NumFolders),SUM(NumFiles),SUM(TotalSize)"
" FROM file_browser_size" " FROM file_browser_size"
" WHERE CrsCod='%ld'", " WHERE CrsCod='%ld'",
Gbl.CurrentCrs.Crs.CrsCod); Gbl.CurrentCrs.Crs.CrsCod);
else if (FileBrowser == Brw_FILE_BRW_BRIEFCASE_USR) else if (FileBrowser == Brw_ADMI_BRIEF_USR)
sprintf (Query,"SELECT '-1',COUNT(DISTINCT file_browser_size.UsrCod),MAX(file_browser_size.NumLevels),SUM(file_browser_size.NumFolders),SUM(file_browser_size.NumFiles),SUM(file_browser_size.TotalSize)" sprintf (Query,"SELECT '-1',COUNT(DISTINCT file_browser_size.UsrCod),MAX(file_browser_size.NumLevels),SUM(file_browser_size.NumFolders),SUM(file_browser_size.NumFiles),SUM(file_browser_size.TotalSize)"
" FROM file_browser_size,crs_usr" " FROM file_browser_size,crs_usr"
" WHERE file_browser_size.FileBrowser='%u'" " WHERE file_browser_size.FileBrowser='%u'"
" AND crs_usr.CrsCod='%ld'" " AND crs_usr.CrsCod='%ld'"
" AND file_browser_size.UsrCod=crs_usr.UsrCod", " AND file_browser_size.UsrCod=crs_usr.UsrCod",
(unsigned) FileBrowser,Gbl.CurrentCrs.Crs.CrsCod); (unsigned) FileBrowser,Gbl.CurrentCrs.Crs.CrsCod);
else if (FileBrowser == Brw_FILE_BRW_ASSIGNMENTS_USR || else if (FileBrowser == Brw_ADMI_ASSIG_USR ||
FileBrowser == Brw_FILE_BRW_WORKS_USR) FileBrowser == Brw_ADMI_WORKS_USR)
sprintf (Query,"SELECT '1',COUNT(DISTINCT UsrCod),MAX(NumLevels),SUM(NumFolders),SUM(NumFiles),SUM(TotalSize)" sprintf (Query,"SELECT '1',COUNT(DISTINCT UsrCod),MAX(NumLevels),SUM(NumFolders),SUM(NumFiles),SUM(TotalSize)"
" FROM file_browser_size" " FROM file_browser_size"
" WHERE FileBrowser='%u'" " WHERE FileBrowser='%u'"
@ -4999,8 +4999,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_FILE_BRW_ADMIN_DOCUMENTS_CRS, (unsigned) Brw_ADMI_DOCUM_CRS,
(unsigned) Brw_FILE_BRW_COMMON_CRS, (unsigned) Brw_ADMI_SHARE_CRS,
(unsigned) License); (unsigned) License);
break; break;
case Sco_SCOPE_CENTRE: case Sco_SCOPE_CENTRE:
@ -5013,8 +5013,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_FILE_BRW_ADMIN_DOCUMENTS_CRS, (unsigned) Brw_ADMI_DOCUM_CRS,
(unsigned) Brw_FILE_BRW_COMMON_CRS, (unsigned) Brw_ADMI_SHARE_CRS,
(unsigned) License); (unsigned) License);
break; break;
case Sco_SCOPE_DEGREE: case Sco_SCOPE_DEGREE:
@ -5026,8 +5026,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_FILE_BRW_ADMIN_DOCUMENTS_CRS, (unsigned) Brw_ADMI_DOCUM_CRS,
(unsigned) Brw_FILE_BRW_COMMON_CRS, (unsigned) Brw_ADMI_SHARE_CRS,
(unsigned) License); (unsigned) License);
break; break;
case Sco_SCOPE_COURSE: case Sco_SCOPE_COURSE:
@ -5077,7 +5077,7 @@ static void Sta_GetAndShowAssignmentsStats (void)
extern const char *Txt_STAT_USE_STAT_TYPES[Sta_NUM_TYPES_USE_STATS]; extern const char *Txt_STAT_USE_STAT_TYPES[Sta_NUM_TYPES_USE_STATS];
extern const char *Txt_Number_of_BR_assignments; extern const char *Txt_Number_of_BR_assignments;
extern const char *Txt_Number_of_BR_courses_with_BR_assignments; extern const char *Txt_Number_of_BR_courses_with_BR_assignments;
extern const char *Txt_Average_number_BR_of_assignments_BR_per_course; extern const char *Txt_Average_number_BR_of_ASSIG_BR_per_course;
extern const char *Txt_Number_of_BR_notifications; extern const char *Txt_Number_of_BR_notifications;
unsigned NumAssignments; unsigned NumAssignments;
unsigned NumNotif; unsigned NumNotif;
@ -5110,7 +5110,7 @@ static void Sta_GetAndShowAssignmentsStats (void)
"</tr>", "</tr>",
Txt_Number_of_BR_assignments, Txt_Number_of_BR_assignments,
Txt_Number_of_BR_courses_with_BR_assignments, Txt_Number_of_BR_courses_with_BR_assignments,
Txt_Average_number_BR_of_assignments_BR_per_course, Txt_Average_number_BR_of_ASSIG_BR_per_course,
Txt_Number_of_BR_notifications); Txt_Number_of_BR_notifications);
/***** Write number of assignments *****/ /***** Write number of assignments *****/

140
swad_text.c
View File

@ -2800,7 +2800,7 @@ const char *Txt_ASG_ATT_OR_SVY_ORDER[2] =
#endif #endif
}; };
const char *Txt_Assignments_zone = const char *Txt_Assignments_area =
#if L==0 #if L==0
"Zona d'activitats"; "Zona d'activitats";
#elif L==1 #elif L==1
@ -2821,7 +2821,7 @@ const char *Txt_Assignments_zone =
"Zona de atividades"; "Zona de atividades";
#endif #endif
const char *Txt_assignments_zone = const char *Txt_assignments_area =
#if L==0 #if L==0
"zona d'activitats"; // Necessita traduccio "zona d'activitats"; // Necessita traduccio
#elif L==1 #elif L==1
@ -2905,7 +2905,7 @@ const char *Txt_Availability =
"Disponibilidade"; "Disponibilidade";
#endif #endif
const char *Txt_Average_number_BR_of_assignments_BR_per_course = const char *Txt_Average_number_BR_of_ASSIG_BR_per_course =
#if L==0 #if L==0
"Nombre mitj&acute;<br />d'activitats<br />per assignatura"; "Nombre mitj&acute;<br />d'activitats<br />per assignatura";
#elif L==1 #elif L==1
@ -4605,27 +4605,6 @@ const char *Txt_Teachers_comment =
"Coment&aacute;rio dos professores"; "Coment&aacute;rio dos professores";
#endif #endif
const char *Txt_common_zone =
#if L==0
"zona d'arxius compartits";
#elif L==1
"Freigegebene Dateien-Bereich";
#elif L==2
"shared files area";
#elif L==3
"zona de archivos compartidos";
#elif L==4
"zone de fichiers partag&eacute;s";
#elif L==5
"zona de archivos compartidos"; // Okoteve traducción
#elif L==6
"zona di file condivisi";
#elif L==7
"Powierzchnia udost&eogon;pnionych plik&oacute;w";
#elif L==8
"zona de arquivos compartilhados";
#endif
const char *Txt_Completely_eliminate_user = const char *Txt_Completely_eliminate_user =
#if L==0 #if L==0
"Eliminar usuari completament"; "Eliminar usuari completament";
@ -8871,7 +8850,7 @@ const char *Txt_documents =
"documentos"; "documentos";
#endif #endif
const char *Txt_Documents_in_my_courses = const char *Txt_DOCUM_in_my_courses =
#if L==0 #if L==0
"Documents en les meves assignatures"; "Documents en les meves assignatures";
#elif L==1 #elif L==1
@ -8892,7 +8871,7 @@ const char *Txt_Documents_in_my_courses =
"Documentos em minha disciplinas"; "Documentos em minha disciplinas";
#endif #endif
const char *Txt_documents_hidden = const char *Txt_DOCUM_hidden =
#if L==0 #if L==0
"documents ocults"; "documents ocults";
#elif L==1 #elif L==1
@ -8913,7 +8892,7 @@ const char *Txt_documents_hidden =
"documentos ocultos"; "documentos ocultos";
#endif #endif
const char *Txt_Documents_zone = const char *Txt_Documents_area =
#if L==0 #if L==0
"Zona de documents"; "Zona de documents";
#elif L==1 #elif L==1
@ -8934,7 +8913,7 @@ const char *Txt_Documents_zone =
"Zona de documentos"; "Zona de documentos";
#endif #endif
const char *Txt_Documents_management_zone = const char *Txt_Documents_management_area =
#if L==0 #if L==0
"Zona d'administraci&oacute; de documents"; "Zona d'administraci&oacute; de documents";
#elif L==1 #elif L==1
@ -8955,7 +8934,7 @@ const char *Txt_Documents_management_zone =
"Zona de gest&atilde;o de documentos"; "Zona de gest&atilde;o de documentos";
#endif #endif
const char *Txt_documents_management_zone = const char *Txt_documents_management_area =
#if L==0 #if L==0
"zona de administraci&oacute;n de documentos"; // Necessita traduccio "zona de administraci&oacute;n de documentos"; // Necessita traduccio
#elif L==1 #elif L==1
@ -15538,7 +15517,7 @@ const char *Txt_Mark_all_notifications_as_read =
"Marcar todas as notifica&ccedil;&otilde;es como lidas"; "Marcar todas as notifica&ccedil;&otilde;es como lidas";
#endif #endif
const char *Txt_Marks_management_zone = const char *Txt_Marks_management_area =
#if L==0 #if L==0
"Zona d'administraci&oacute; de qualificacions"; "Zona d'administraci&oacute; de qualificacions";
#elif L==1 #elif L==1
@ -15559,7 +15538,7 @@ const char *Txt_Marks_management_zone =
"Zona de gest&atilde;o de notas"; "Zona de gest&atilde;o de notas";
#endif #endif
const char *Txt_marks_management_zone = const char *Txt_marks_management_area =
#if L==0 #if L==0
"zona de administraci&oacute;n de calificaciones"; // Necessita traduccio "zona de administraci&oacute;n de calificaciones"; // Necessita traduccio
#elif L==1 #elif L==1
@ -15580,7 +15559,7 @@ const char *Txt_marks_management_zone =
"zona de gest&atilde;o de notas"; "zona de gest&atilde;o de notas";
#endif #endif
const char *Txt_Marks_zone = const char *Txt_Marks_area =
#if L==0 #if L==0
"Zona de qualificacions"; "Zona de qualificacions";
#elif L==1 #elif L==1
@ -22749,7 +22728,7 @@ const char *Txt_No_of_files =
"N&ordm; de arquivos"; "N&ordm; de arquivos";
#endif #endif
const char *Txt_No_of_files_in_common_zones = const char *Txt_No_of_files_in_SHARE_zones =
#if L==0 #if L==0
"Nombre d'arxius compartits"; "Nombre d'arxius compartits";
#elif L==1 #elif L==1
@ -22770,7 +22749,7 @@ const char *Txt_No_of_files_in_common_zones =
"N&ordm; de arquivos compartilhados"; "N&ordm; de arquivos compartilhados";
#endif #endif
const char *Txt_No_of_files_in_documents_zones = const char *Txt_No_of_files_in_DOCUM_zones =
#if L==0 #if L==0
"N&ordm; de archivos en zonas de documentos"; // Necessita traduccio "N&ordm; de archivos en zonas de documentos"; // Necessita traduccio
#elif L==1 #elif L==1
@ -26537,7 +26516,7 @@ const char *Txt_Private_Photo =
"Foto privada"; "Foto privada";
#endif #endif
const char *Txt_Private_storage_zone = const char *Txt_Private_storage_area =
#if L==0 #if L==0
"Zona d'emmagatzematge privada"; "Zona d'emmagatzematge privada";
#elif L==1 #elif L==1
@ -26558,7 +26537,7 @@ const char *Txt_Private_storage_zone =
"Zona privada de armazenamento"; "Zona privada de armazenamento";
#endif #endif
const char *Txt_private_storage_zone = const char *Txt_private_storage_area =
#if L==0 #if L==0
"zona de almacenamiento privada"; // Necessita traduccio "zona de almacenamiento privada"; // Necessita traduccio
#elif L==1 #elif L==1
@ -31916,9 +31895,9 @@ const char *Txt_Rooms_with_users =
const char *Txt_ROOT_FOLDER_EXTERNAL_NAMES[Brw_NUM_TYPES_FILE_BROWSER] = const char *Txt_ROOT_FOLDER_EXTERNAL_NAMES[Brw_NUM_TYPES_FILE_BROWSER] =
{ {
// Brw_FILE_BRW_UNKNOWN // Brw_UNKNOWN
"", "",
// Brw_FILE_BRW_SEE_DOCUMENTS_CRS // Brw_SHOW_DOCUM_CRS
#if L==0 #if L==0
"documents" "documents"
#elif L==1 #elif L==1
@ -31939,7 +31918,7 @@ const char *Txt_ROOT_FOLDER_EXTERNAL_NAMES[Brw_NUM_TYPES_FILE_BROWSER] =
"documentos" "documentos"
#endif #endif
, ,
// Brw_FILE_BRW_SEE_MARKS_CRS // Brw_SHOW_MARKS_CRS
#if L==0 #if L==0
"qualificacions" "qualificacions"
#elif L==1 #elif L==1
@ -31960,7 +31939,7 @@ const char *Txt_ROOT_FOLDER_EXTERNAL_NAMES[Brw_NUM_TYPES_FILE_BROWSER] =
"notas" "notas"
#endif #endif
, ,
// Brw_FILE_BRW_ADMIN_DOCUMENTS_CRS // Brw_ADMI_DOCUM_CRS
#if L==0 #if L==0
"documents" "documents"
#elif L==1 #elif L==1
@ -31981,7 +31960,7 @@ const char *Txt_ROOT_FOLDER_EXTERNAL_NAMES[Brw_NUM_TYPES_FILE_BROWSER] =
"documentos" "documentos"
#endif #endif
, ,
// Brw_FILE_BRW_COMMON_CRS // Brw_ADMI_SHARE_CRS
#if L==0 #if L==0
"compartits" "compartits"
#elif L==1 #elif L==1
@ -32002,7 +31981,7 @@ const char *Txt_ROOT_FOLDER_EXTERNAL_NAMES[Brw_NUM_TYPES_FILE_BROWSER] =
"comum" "comum"
#endif #endif
, ,
// Brw_FILE_BRW_COMMON_GRP // Brw_ADMI_SHARE_GRP
#if L==0 #if L==0
"compartits" "compartits"
#elif L==1 #elif L==1
@ -32023,7 +32002,7 @@ const char *Txt_ROOT_FOLDER_EXTERNAL_NAMES[Brw_NUM_TYPES_FILE_BROWSER] =
"comum" "comum"
#endif #endif
, ,
// Brw_FILE_BRW_WORKS_USR // Brw_ADMI_WORKS_USR
#if L==0 #if L==0
"treballs" "treballs"
#elif L==1 #elif L==1
@ -32044,7 +32023,7 @@ const char *Txt_ROOT_FOLDER_EXTERNAL_NAMES[Brw_NUM_TYPES_FILE_BROWSER] =
"trabalhos" "trabalhos"
#endif #endif
, ,
// Brw_FILE_BRW_WORKS_CRS // Brw_ADMI_WORKS_CRS
#if L==0 #if L==0
"treballs" "treballs"
#elif L==1 #elif L==1
@ -32065,7 +32044,7 @@ const char *Txt_ROOT_FOLDER_EXTERNAL_NAMES[Brw_NUM_TYPES_FILE_BROWSER] =
"trabalhos" "trabalhos"
#endif #endif
, ,
// Brw_FILE_BRW_ADMIN_MARKS_CRS // Brw_ADMI_MARKS_CRS
#if L==0 #if L==0
"qualificacions" "qualificacions"
#elif L==1 #elif L==1
@ -32086,7 +32065,7 @@ const char *Txt_ROOT_FOLDER_EXTERNAL_NAMES[Brw_NUM_TYPES_FILE_BROWSER] =
"notas" "notas"
#endif #endif
, ,
// Brw_FILE_BRW_BRIEFCASE_USR // Brw_ADMI_BRIEF_USR
#if L==0 #if L==0
"maleti" "maleti"
#elif L==1 #elif L==1
@ -32107,7 +32086,7 @@ const char *Txt_ROOT_FOLDER_EXTERNAL_NAMES[Brw_NUM_TYPES_FILE_BROWSER] =
"pasta" "pasta"
#endif #endif
, ,
// Brw_FILE_BRW_SEE_DOCUMENTS_GRP // Brw_SHOW_DOCUM_GRP
#if L==0 #if L==0
"documents" "documents"
#elif L==1 #elif L==1
@ -32128,7 +32107,7 @@ const char *Txt_ROOT_FOLDER_EXTERNAL_NAMES[Brw_NUM_TYPES_FILE_BROWSER] =
"documentos" "documentos"
#endif #endif
, ,
// Brw_FILE_BRW_ADMIN_DOCUMENTS_GRP // Brw_ADMI_DOCUM_GRP
#if L==0 #if L==0
"documents" "documents"
#elif L==1 #elif L==1
@ -32149,7 +32128,7 @@ const char *Txt_ROOT_FOLDER_EXTERNAL_NAMES[Brw_NUM_TYPES_FILE_BROWSER] =
"documentos" "documentos"
#endif #endif
, ,
// Brw_FILE_BRW_SEE_MARKS_GRP // Brw_SHOW_MARKS_GRP
#if L==0 #if L==0
"qualificacions" // Necessita traduccio "qualificacions" // Necessita traduccio
#elif L==1 #elif L==1
@ -32170,7 +32149,7 @@ const char *Txt_ROOT_FOLDER_EXTERNAL_NAMES[Brw_NUM_TYPES_FILE_BROWSER] =
"notas" "notas"
#endif #endif
, ,
// Brw_FILE_BRW_ADMIN_MARKS_GRP // Brw_ADMI_MARKS_GRP
#if L==0 #if L==0
"qualificacions" "qualificacions"
#elif L==1 #elif L==1
@ -32191,7 +32170,7 @@ const char *Txt_ROOT_FOLDER_EXTERNAL_NAMES[Brw_NUM_TYPES_FILE_BROWSER] =
"notas" "notas"
#endif #endif
, ,
// Brw_FILE_BRW_ASSIGNMENTS_USR // Brw_ADMI_ASSIG_USR
#if L==0 #if L==0
"activitats" "activitats"
#elif L==1 #elif L==1
@ -32212,7 +32191,7 @@ const char *Txt_ROOT_FOLDER_EXTERNAL_NAMES[Brw_NUM_TYPES_FILE_BROWSER] =
"atividades" "atividades"
#endif #endif
, ,
// Brw_FILE_BRW_ASSIGNMENTS_CRS // Brw_ADMI_ASSIG_CRS
#if L==0 #if L==0
"activitats" "activitats"
#elif L==1 #elif L==1
@ -32233,7 +32212,7 @@ const char *Txt_ROOT_FOLDER_EXTERNAL_NAMES[Brw_NUM_TYPES_FILE_BROWSER] =
"atividades" "atividades"
#endif #endif
, ,
// Brw_FILE_BRW_SEE_DOCUMENTS_DEG // Brw_SHOW_DOCUM_DEG
#if L==0 #if L==0
"documents" "documents"
#elif L==1 #elif L==1
@ -32254,7 +32233,7 @@ const char *Txt_ROOT_FOLDER_EXTERNAL_NAMES[Brw_NUM_TYPES_FILE_BROWSER] =
"documentos" "documentos"
#endif #endif
, ,
// Brw_FILE_BRW_ADMIN_DOCUMENTS_DEG // Brw_ADMI_DOCUM_DEG
#if L==0 #if L==0
"documents" "documents"
#elif L==1 #elif L==1
@ -32275,7 +32254,7 @@ const char *Txt_ROOT_FOLDER_EXTERNAL_NAMES[Brw_NUM_TYPES_FILE_BROWSER] =
"documentos" "documentos"
#endif #endif
, ,
// Brw_FILE_BRW_SEE_DOCUMENTS_CTR // Brw_SHOW_DOCUM_CTR
#if L==0 #if L==0
"documents" "documents"
#elif L==1 #elif L==1
@ -32296,7 +32275,7 @@ const char *Txt_ROOT_FOLDER_EXTERNAL_NAMES[Brw_NUM_TYPES_FILE_BROWSER] =
"documentos" "documentos"
#endif #endif
, ,
// Brw_FILE_BRW_ADMIN_DOCUMENTS_CTR // Brw_ADMI_DOCUM_CTR
#if L==0 #if L==0
"documents" "documents"
#elif L==1 #elif L==1
@ -32317,7 +32296,7 @@ const char *Txt_ROOT_FOLDER_EXTERNAL_NAMES[Brw_NUM_TYPES_FILE_BROWSER] =
"documentos" "documentos"
#endif #endif
, ,
// Brw_FILE_BRW_SEE_DOCUMENTS_INS // Brw_SHOW_DOCUM_INS
#if L==0 #if L==0
"documents" "documents"
#elif L==1 #elif L==1
@ -32338,7 +32317,7 @@ const char *Txt_ROOT_FOLDER_EXTERNAL_NAMES[Brw_NUM_TYPES_FILE_BROWSER] =
"documentos" "documentos"
#endif #endif
, ,
// Brw_FILE_BRW_ADMIN_DOCUMENTS_INS // Brw_ADMI_DOCUM_INS
#if L==0 #if L==0
"documents" "documents"
#elif L==1 #elif L==1
@ -33356,6 +33335,27 @@ const char *Txt_Shared_files_area =
"Zona comum"; "Zona comum";
#endif #endif
const char *Txt_shared_files_area =
#if L==0
"zona d'arxius compartits";
#elif L==1
"Freigegebene Dateien-Bereich";
#elif L==2
"shared files area";
#elif L==3
"zona de archivos compartidos";
#elif L==4
"zone de fichiers partag&eacute;s";
#elif L==5
"zona de archivos compartidos"; // Okoteve traducción
#elif L==6
"zona di file condivisi";
#elif L==7
"Powierzchnia udost&eogon;pnionych plik&oacute;w";
#elif L==8
"zona de arquivos compartilhados";
#endif
const char *Txt_Short_Name = const char *Txt_Short_Name =
#if L==0 #if L==0
"Nombre breve"; // Necessita traduccio "Nombre breve"; // Necessita traduccio
@ -34622,7 +34622,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 &nbsp; instead of space const char *Txt_STAT_COURSE_FILE_ZONES[Sta_NUM_STAT_CRS_FILE_ZONES] = // Use &nbsp; instead of space
{ {
#if L==0 // Brw_FILE_BRW_ADMIN_DOCUMENTS_CRS #if L==0 // Brw_ADMI_DOCUM_CRS
"Documents&nbsp;(ass.)" "Documents&nbsp;(ass.)"
#elif L==1 #elif L==1
"Dokumente&nbsp;(Ver.)" "Dokumente&nbsp;(Ver.)"
@ -34642,7 +34642,7 @@ const char *Txt_STAT_COURSE_FILE_ZONES[Sta_NUM_STAT_CRS_FILE_ZONES] = // Use &nb
"Documentos&nbsp;(crs.)" "Documentos&nbsp;(crs.)"
#endif #endif
, ,
#if L==0 // Brw_FILE_BRW_ADMIN_DOCUMENTS_GRP #if L==0 // Brw_ADMI_DOCUM_GRP
"Documents&nbsp;(grp.)" "Documents&nbsp;(grp.)"
#elif L==1 #elif L==1
"Dokumente&nbsp;(Grp.)" "Dokumente&nbsp;(Grp.)"
@ -34662,7 +34662,7 @@ const char *Txt_STAT_COURSE_FILE_ZONES[Sta_NUM_STAT_CRS_FILE_ZONES] = // Use &nb
"Documentos&nbsp;(grp.)" "Documentos&nbsp;(grp.)"
#endif #endif
, ,
#if L==0 // Brw_FILE_BRW_COMMON_CRS #if L==0 // Brw_ADMI_SHARE_CRS
"Compartits&nbsp;(asg.)" "Compartits&nbsp;(asg.)"
#elif L==1 #elif L==1
"Freigegebene&nbsp;(Ver.)" "Freigegebene&nbsp;(Ver.)"
@ -34682,7 +34682,7 @@ const char *Txt_STAT_COURSE_FILE_ZONES[Sta_NUM_STAT_CRS_FILE_ZONES] = // Use &nb
"Compartilhados&nbsp;(crs.)" "Compartilhados&nbsp;(crs.)"
#endif #endif
, ,
#if L==0 // Brw_FILE_BRW_COMMON_GRP #if L==0 // Brw_ADMI_SHARE_GRP
"Compartits&nbsp;(grp.)" "Compartits&nbsp;(grp.)"
#elif L==1 #elif L==1
"Freigegebene&nbsp;(Grp.)" "Freigegebene&nbsp;(Grp.)"
@ -34702,7 +34702,7 @@ const char *Txt_STAT_COURSE_FILE_ZONES[Sta_NUM_STAT_CRS_FILE_ZONES] = // Use &nb
"Compartilhados&nbsp;(grp.)" "Compartilhados&nbsp;(grp.)"
#endif #endif
, ,
#if L==0 // Brw_FILE_BRW_ADMIN_MARKS_CRS #if L==0 // Brw_ADMI_MARKS_CRS
"Qualific.&nbsp;(ass.)" "Qualific.&nbsp;(ass.)"
#elif L==1 #elif L==1
"Bewertungen&nbsp;(Ver.)" "Bewertungen&nbsp;(Ver.)"
@ -34722,7 +34722,7 @@ const char *Txt_STAT_COURSE_FILE_ZONES[Sta_NUM_STAT_CRS_FILE_ZONES] = // Use &nb
"Notas&nbsp;(crs.)" "Notas&nbsp;(crs.)"
#endif #endif
, ,
#if L==0 // Brw_FILE_BRW_ADMIN_MARKS_GRP #if L==0 // Brw_ADMI_MARKS_GRP
"Calific.&nbsp;(grp.)" // Necessita traduccio "Calific.&nbsp;(grp.)" // Necessita traduccio
#elif L==1 #elif L==1
"Bewertungen&nbsp;(Grp.)" "Bewertungen&nbsp;(Grp.)"
@ -34742,7 +34742,7 @@ const char *Txt_STAT_COURSE_FILE_ZONES[Sta_NUM_STAT_CRS_FILE_ZONES] = // Use &nb
"Notas&nbsp;(grp.)" "Notas&nbsp;(grp.)"
#endif #endif
, ,
#if L==0 // Brw_FILE_BRW_ASSIGNMENTS_USR #if L==0 // Brw_ADMI_ASSIG_USR
"Activitats" "Activitats"
#elif L==1 #elif L==1
"Aufgaben" "Aufgaben"
@ -34762,7 +34762,7 @@ const char *Txt_STAT_COURSE_FILE_ZONES[Sta_NUM_STAT_CRS_FILE_ZONES] = // Use &nb
"Atividades" "Atividades"
#endif #endif
, ,
#if L==0 // Brw_FILE_BRW_WORKS_USR #if L==0 // Brw_ADMI_WORKS_USR
"Treballs" "Treballs"
#elif L==1 #elif L==1
"Hausarbeiten" "Hausarbeiten"
@ -34782,7 +34782,7 @@ const char *Txt_STAT_COURSE_FILE_ZONES[Sta_NUM_STAT_CRS_FILE_ZONES] = // Use &nb
"Trabalhos" "Trabalhos"
#endif #endif
, ,
#if L==0 // Brw_FILE_BRW_UNKNOWN #if L==0 // Brw_UNKNOWN
"Total" "Total"
#elif L==1 #elif L==1
"Gesamtzahl" "Gesamtzahl"
@ -43281,7 +43281,7 @@ const char *Txt_this_field_is_filled_in_the_records_of_X_students = // Warning:
" (this field is filled in the records of %u students)"; // Necessita de tradução " (this field is filled in the records of %u students)"; // Necessita de tradução
#endif #endif
const char *Txt_This_option_is_now_in_Documents_Edit = const char *Txt_This_option_is_now_in_DOCUM_Edit =
#if L==0 #if L==0
"Aquesta opci&oacute; est&agrave; ara en Documents &gt; Editar"; "Aquesta opci&oacute; est&agrave; ara en Documents &gt; Editar";
#elif L==1 #elif L==1
@ -47125,7 +47125,7 @@ const char *Txt_Works_of_X_in_Y_removed = // Warning: it is very important to in
" in <strong>%s</strong> removed."; // Necessita de tradução " in <strong>%s</strong> removed."; // Necessita de tradução
#endif #endif
const char *Txt_Works_zone = const char *Txt_Works_area =
#if L==0 #if L==0
"Zona d'altres treballs"; "Zona d'altres treballs";
#elif L==1 #elif L==1
@ -47146,7 +47146,7 @@ const char *Txt_Works_zone =
"Zona de trabalhos"; "Zona de trabalhos";
#endif #endif
const char *Txt_works_zone = const char *Txt_works_area =
#if L==0 #if L==0
"zona de trabajos"; // Necessita traduccio "zona de trabajos"; // Necessita traduccio
#elif L==1 #elif L==1

36
swad_web_service.c
View File

@ -3603,26 +3603,26 @@ int swad__getDirectoryTree (struct soap *soap,
switch (treeCode) switch (treeCode)
{ {
case 1: // Documents case 1: // Documents
Gbl.FileBrowser.Type = Brw_FILE_BRW_SEE_DOCUMENTS_GRP; Gbl.FileBrowser.Type = Brw_SHOW_DOCUM_GRP;
break; break;
case 2: // Shared files case 2: // Shared files
Gbl.FileBrowser.Type = Brw_FILE_BRW_COMMON_GRP; Gbl.FileBrowser.Type = Brw_ADMI_SHARE_GRP;
break; break;
case 3: // Marks case 3: // Marks
Gbl.FileBrowser.Type = Brw_FILE_BRW_SEE_MARKS_GRP; Gbl.FileBrowser.Type = Brw_SHOW_MARKS_GRP;
break; break;
} }
else // groupCode <= 0 else // groupCode <= 0
switch (treeCode) switch (treeCode)
{ {
case 1: // Documents case 1: // Documents
Gbl.FileBrowser.Type = Brw_FILE_BRW_SEE_DOCUMENTS_CRS; Gbl.FileBrowser.Type = Brw_SHOW_DOCUM_CRS;
break; break;
case 2: // Shared files case 2: // Shared files
Gbl.FileBrowser.Type = Brw_FILE_BRW_COMMON_CRS; Gbl.FileBrowser.Type = Brw_ADMI_SHARE_CRS;
break; break;
case 3: // Marks case 3: // Marks
Gbl.FileBrowser.Type = Brw_FILE_BRW_SEE_MARKS_CRS; Gbl.FileBrowser.Type = Brw_SHOW_MARKS_CRS;
break; break;
} }
} }
@ -3748,8 +3748,8 @@ static bool Svc_WriteRowFileBrowser (unsigned Level,Brw_FileType_t FileType,cons
char PhotoURL[PATH_MAX+1]; char PhotoURL[PATH_MAX+1];
/***** Is this row hidden or visible? *****/ /***** Is this row hidden or visible? *****/
if (Gbl.FileBrowser.Type == Brw_FILE_BRW_SEE_DOCUMENTS_CRS || if (Gbl.FileBrowser.Type == Brw_SHOW_DOCUM_CRS ||
Gbl.FileBrowser.Type == Brw_FILE_BRW_SEE_DOCUMENTS_GRP) Gbl.FileBrowser.Type == Brw_SHOW_DOCUM_GRP)
if (Brw_CheckIfFileOrFolderIsSetAsHiddenInDB (FileType, if (Brw_CheckIfFileOrFolderIsSetAsHiddenInDB (FileType,
Gbl.FileBrowser.Priv.FullPathInTree)) Gbl.FileBrowser.Priv.FullPathInTree))
return false; return false;
@ -3898,15 +3898,15 @@ 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_FILE_BRW_SEE_DOCUMENTS_CRS: // This type of file browser is not in database // case Brw_SHOW_DOCUM_CRS: // This type of file browser is not in database
// case Brw_FILE_BRW_SEE_DOCUMENTS_GRP: // This type of file browser is not in database // case Brw_SHOW_DOCUM_GRP: // This type of file browser is not in database
case Brw_FILE_BRW_ADMIN_DOCUMENTS_CRS: case Brw_ADMI_DOCUM_CRS:
case Brw_FILE_BRW_ADMIN_DOCUMENTS_GRP: case Brw_ADMI_DOCUM_GRP:
case Brw_FILE_BRW_COMMON_CRS: case Brw_ADMI_SHARE_CRS:
case Brw_FILE_BRW_COMMON_GRP: case Brw_ADMI_SHARE_GRP:
break; break;
case Brw_FILE_BRW_ADMIN_MARKS_CRS: case Brw_ADMI_MARKS_CRS:
case Brw_FILE_BRW_ADMIN_MARKS_GRP: case Brw_ADMI_MARKS_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.RoleInCurrentCrsDB != Rol_ROLE_TEACHER) if (Gbl.Usrs.Me.UsrDat.RoleInCurrentCrsDB != Rol_ROLE_TEACHER)
return soap_receiver_fault (Gbl.soap, return soap_receiver_fault (Gbl.soap,
@ -3997,8 +3997,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_FILE_BRW_ADMIN_MARKS_CRS && (FileMetadata.FileBrowser != Brw_ADMI_MARKS_CRS &&
FileMetadata.FileBrowser != Brw_FILE_BRW_ADMIN_MARKS_GRP)) FileMetadata.FileBrowser != Brw_ADMI_MARKS_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");

72
swad_zip.c
View File

@ -54,28 +54,28 @@
const Act_Action_t ZIP_ActZIPFolder[Brw_NUM_TYPES_FILE_BROWSER] = const Act_Action_t ZIP_ActZIPFolder[Brw_NUM_TYPES_FILE_BROWSER] =
{ {
ActUnk, // Brw_FILE_BRW_UNKNOWN ActUnk, // Brw_UNKNOWN
ActZIPSeeDocCrs, // Brw_FILE_BRW_SEE_DOCUMENTS_CRS ActZIPSeeDocCrs, // Brw_SHOW_DOCUM_CRS
ActUnk, // Brw_FILE_BRW_SEE_MARKS_CRS ActUnk, // Brw_SHOW_MARKS_CRS
ActZIPAdmDocCrs, // Brw_FILE_BRW_ADMIN_DOCUMENTS_CRS ActZIPAdmDocCrs, // Brw_ADMI_DOCUM_CRS
ActZIPComCrs, // Brw_FILE_BRW_COMMON_CRS ActZIPComCrs, // Brw_ADMI_SHARE_CRS
ActZIPComGrp, // Brw_FILE_BRW_COMMON_GRP ActZIPComGrp, // Brw_ADMI_SHARE_GRP
ActZIPWrkUsr, // Brw_FILE_BRW_WORKS_USR ActZIPWrkUsr, // Brw_ADMI_WORKS_USR
ActZIPWrkCrs, // Brw_FILE_BRW_WORKS_CRS ActZIPWrkCrs, // Brw_ADMI_WORKS_CRS
ActZIPAdmMrkCrs, // Brw_FILE_BRW_ADMIN_MARKS_CRS ActZIPAdmMrkCrs, // Brw_ADMI_MARKS_CRS
ActZIPBrf, // Brw_FILE_BRW_BRIEFCASE_USR ActZIPBrf, // Brw_ADMI_BRIEF_USR
ActZIPSeeDocGrp, // Brw_FILE_BRW_SEE_DOCUMENTS_GRP ActZIPSeeDocGrp, // Brw_SHOW_DOCUM_GRP
ActZIPAdmDocGrp, // Brw_FILE_BRW_ADMIN_DOCUMENTS_GRP ActZIPAdmDocGrp, // Brw_ADMI_DOCUM_GRP
ActUnk, // Brw_FILE_BRW_SEE_MARKS_GRP ActUnk, // Brw_SHOW_MARKS_GRP
ActZIPAdmMrkGrp, // Brw_FILE_BRW_ADMIN_MARKS_GRP ActZIPAdmMrkGrp, // Brw_ADMI_MARKS_GRP
ActZIPAsgUsr, // Brw_FILE_BRW_ASSIGNMENTS_USR ActZIPAsgUsr, // Brw_ADMI_ASSIG_USR
ActZIPAsgCrs, // Brw_FILE_BRW_ASSIGNMENTS_CRS ActZIPAsgCrs, // Brw_ADMI_ASSIG_CRS
ActZIPSeeDocDeg, // Brw_FILE_BRW_SEE_DOCUMENTS_DEG ActZIPSeeDocDeg, // Brw_SHOW_DOCUM_DEG
ActZIPAdmDocDeg, // Brw_FILE_BRW_ADMIN_DOCUMENTS_DEG ActZIPAdmDocDeg, // Brw_ADMI_DOCUM_DEG
ActZIPSeeDocCtr, // Brw_FILE_BRW_SEE_DOCUMENTS_CTR ActZIPSeeDocCtr, // Brw_SHOW_DOCUM_CTR
ActZIPAdmDocCtr, // Brw_FILE_BRW_ADMIN_DOCUMENTS_CTR ActZIPAdmDocCtr, // Brw_ADMI_DOCUM_CTR
ActZIPSeeDocIns, // Brw_FILE_BRW_SEE_DOCUMENTS_INS ActZIPSeeDocIns, // Brw_SHOW_DOCUM_INS
ActZIPAdmDocIns, // Brw_FILE_BRW_ADMIN_DOCUMENTS_INS ActZIPAdmDocIns, // Brw_ADMI_DOCUM_INS
}; };
/*****************************************************************************/ /*****************************************************************************/
@ -286,15 +286,15 @@ void ZIP_PutButtonToDownloadZIPOfAFolder (const char *PathInTree,const char *Fil
Act_FormStart (ZIP_ActZIPFolder[Gbl.FileBrowser.Type]); Act_FormStart (ZIP_ActZIPFolder[Gbl.FileBrowser.Type]);
switch (Gbl.FileBrowser.Type) switch (Gbl.FileBrowser.Type)
{ {
case Brw_FILE_BRW_SEE_DOCUMENTS_GRP: case Brw_SHOW_DOCUM_GRP:
case Brw_FILE_BRW_ADMIN_DOCUMENTS_GRP: case Brw_ADMI_DOCUM_GRP:
case Brw_FILE_BRW_COMMON_GRP: case Brw_ADMI_SHARE_GRP:
case Brw_FILE_BRW_SEE_MARKS_GRP: case Brw_SHOW_MARKS_GRP:
case Brw_FILE_BRW_ADMIN_MARKS_GRP: case Brw_ADMI_MARKS_GRP:
Grp_PutParamGrpCod (Gbl.CurrentCrs.Grps.GrpCod); Grp_PutParamGrpCod (Gbl.CurrentCrs.Grps.GrpCod);
break; break;
case Brw_FILE_BRW_ASSIGNMENTS_CRS: case Brw_ADMI_ASSIG_CRS:
case Brw_FILE_BRW_WORKS_CRS: case Brw_ADMI_WORKS_CRS:
Usr_PutHiddenParUsrCodAll (ZIP_ActZIPFolder[Gbl.FileBrowser.Type],Gbl.Usrs.Select.All); Usr_PutHiddenParUsrCodAll (ZIP_ActZIPFolder[Gbl.FileBrowser.Type],Gbl.Usrs.Select.All);
Usr_PutParamOtherUsrCodEncrypted (Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); Usr_PutParamOtherUsrCodEncrypted (Gbl.Usrs.Other.UsrDat.EncryptedUsrCod);
break; break;
@ -449,13 +449,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_FILE_BRW_SEE_DOCUMENTS_INS || bool SeeDocsZone = Gbl.FileBrowser.Type == Brw_SHOW_DOCUM_INS ||
Gbl.FileBrowser.Type == Brw_FILE_BRW_SEE_DOCUMENTS_CTR || Gbl.FileBrowser.Type == Brw_SHOW_DOCUM_CTR ||
Gbl.FileBrowser.Type == Brw_FILE_BRW_SEE_DOCUMENTS_DEG || Gbl.FileBrowser.Type == Brw_SHOW_DOCUM_DEG ||
Gbl.FileBrowser.Type == Brw_FILE_BRW_SEE_DOCUMENTS_CRS || Gbl.FileBrowser.Type == Brw_SHOW_DOCUM_CRS ||
Gbl.FileBrowser.Type == Brw_FILE_BRW_SEE_DOCUMENTS_GRP; Gbl.FileBrowser.Type == Brw_SHOW_DOCUM_GRP;
bool SeeMarks = Gbl.FileBrowser.Type == Brw_FILE_BRW_SEE_MARKS_CRS || bool SeeMarks = Gbl.FileBrowser.Type == Brw_SHOW_MARKS_CRS ||
Gbl.FileBrowser.Type == Brw_FILE_BRW_SEE_MARKS_GRP; Gbl.FileBrowser.Type == Brw_SHOW_MARKS_GRP;
unsigned long long FullSize = 0; unsigned long long FullSize = 0;
/***** Scan directory *****/ /***** Scan directory *****/