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 16.45.6

This commit is contained in:
Antonio Cañas Vargas 2016-10-28 00:23:02 +02:00
parent e081f1fc4d
commit e6da157c25
7 changed files with 113 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
swad_centre.c
View File

@ -1661,6 +1661,12 @@ void Ctr_RemoveCentre (void)
Lay_ShowAlert (Lay_WARNING,Txt_To_remove_a_centre_you_must_first_remove_all_degrees_and_teachers_in_the_centre);
else // Centre has no teachers ==> remove it
{
/***** Remove all the threads and posts in forums of the centre *****/
For_RemoveForums (Sco_SCOPE_CTR,Ctr.CtrCod);
/***** Remove surveys of the centre *****/
Svy_RemoveSurveys (Sco_SCOPE_CTR,Ctr.CtrCod);
/***** Remove information related to files in centre *****/
Brw_RemoveCtrFilesFromDB (Ctr.CtrCod);

4
swad_changelog.h
View File

@ -154,13 +154,15 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.45.4 (2016-10-27)"
#define Log_PLATFORM_VERSION "SWAD 16.45.6 (2016-10-28)"
#define CSS_FILE "swad16.32.1.css"
#define JS_FILE "swad15.238.1.js"
// Number of lines (includes comments but not blank lines) has been got with the following command:
// nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1
/*
Version 16.45.6: Oct 28, 2016 Remove forums and surveys of a centre when removing it. (205922 lines)
Version 16.45.5: Oct 28, 2016 Code refactoring in forums. (205919 lines)
Version 16.45.4: Oct 27, 2016 Code refactoring in degree forums. (205916 lines)
Version 16.45.3: Oct 27, 2016 Code refactoring in course forums. (205906 lines)
Version 16.45.2: Oct 27, 2016 Code refactoring related with scopes. (205896 lines)

8
swad_course.c
View File

@ -2229,9 +2229,6 @@ static void Crs_EmptyCourseCompletely (long CrsCod)
/***** Remove attendance events of the course *****/
Att_RemoveCrsAttEvents (CrsCod);
/***** Remove surveys of the course *****/
Svy_RemoveSurveys (Sco_SCOPE_CRS,CrsCod);
/***** Remove notices in the course *****/
/* Copy all notices from the course to table of deleted notices */
sprintf (Query,"INSERT INTO notices_deleted"
@ -2245,7 +2242,10 @@ static void Crs_EmptyCourseCompletely (long CrsCod)
DB_QueryDELETE (Query,"can not remove notices in a course");
/***** Remove all the threads and posts in forums of the course *****/
For_RemoveCrsForums (CrsCod);
For_RemoveForums (Sco_SCOPE_CRS,CrsCod);
/***** Remove surveys of the course *****/
Svy_RemoveSurveys (Sco_SCOPE_CRS,CrsCod);
/***** Remove all test exams made in the course *****/
Tst_RemoveCrsExams (CrsCod);

10
swad_degree.c
View File

@ -2284,13 +2284,11 @@ void Deg_RemoveDegreeCompletely (long DegCod)
/* Free structure that stores the query result */
DB_FreeMySQLResult (&mysql_res);
/***** Remove surveys of the degree
(not including surveys of courses in degree,
already removed) *****/
Svy_RemoveSurveys (Sco_SCOPE_DEG,DegCod);
/***** Remove all the threads and posts in forums of the degree *****/
For_RemoveDegForums (DegCod);
For_RemoveForums (Sco_SCOPE_DEG,DegCod);
/***** Remove surveys of the degree *****/
Svy_RemoveSurveys (Sco_SCOPE_DEG,DegCod);
/***** Remove information related to files in degree *****/
Brw_RemoveDegFilesFromDB (DegCod);

172
swad_forum.c
View File

@ -63,8 +63,8 @@ const unsigned PermissionThreadDeletion[For_NUM_TYPES_FORUM] =
0x1E0, // For_FORUM_DEGREE_TCHS
0x1C0, // For_FORUM_CENTRE_USRS
0x1C0, // For_FORUM_CENTRE_TCHS
0x180, // For_FORUM_INSTITUTION_USRS
0x180, // For_FORUM_INSTITUTION_TCHS
0x180, // For_FORUM_INSTIT_USRS
0x180, // For_FORUM_INSTIT_TCHS
0x100, // For_FORUM_GLOBAL_USRS
0x100, // For_FORUM_GLOBAL_TCHS
0x100, // For_FORUM_SWAD_USRS
@ -567,8 +567,8 @@ static long For_InsertForumThread (For_ForumType_t ForumType,long FirstPstCod)
" VALUES ('%u','-1','%ld','%ld')",
(unsigned) ForumType,FirstPstCod,FirstPstCod);
break;
case For_FORUM_INSTITUTION_USRS:
case For_FORUM_INSTITUTION_TCHS:
case For_FORUM_INSTIT_USRS:
case For_FORUM_INSTIT_TCHS:
sprintf (Query,"INSERT INTO forum_thread"
" (ForumType,Location,FirstPstCod,LastPstCod)"
" VALUES ('%u','%ld','%ld','%ld')",
@ -1029,7 +1029,7 @@ static void For_ShowThreadPosts (long ThrCod,char *LastSubject)
case For_FORUM_CENTRE_USRS: case For_FORUM_CENTRE_TCHS:
ICanModerateForum = Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM;
break;
case For_FORUM_INSTITUTION_USRS: case For_FORUM_INSTITUTION_TCHS:
case For_FORUM_INSTIT_USRS: case For_FORUM_INSTIT_TCHS:
ICanModerateForum = Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM;
break;
case For_FORUM_DEGREE_USRS: case For_FORUM_DEGREE_TCHS:
@ -1430,8 +1430,8 @@ static void For_WriteNumberOfPosts (For_ForumType_t ForumType,long UsrCod)
/***** Get number of posts from database *****/
switch (ForumType)
{
case For_FORUM_INSTITUTION_USRS:
case For_FORUM_INSTITUTION_TCHS:
case For_FORUM_INSTIT_USRS:
case For_FORUM_INSTIT_TCHS:
sprintf (SubQuery," AND forum_thread.Location='%ld'",
Gbl.Forum.Ins.InsCod);
break;
@ -1577,7 +1577,7 @@ void For_SetForumTypeAndRestrictAccess (void)
case ActCutThrForInsUsr: case ActPasThrForInsUsr:
case ActDelPstForInsUsr:
case ActEnbPstForInsUsr: case ActDisPstForInsUsr:
Gbl.Forum.ForumType = For_FORUM_INSTITUTION_USRS;
Gbl.Forum.ForumType = For_FORUM_INSTIT_USRS;
Gbl.Forum.Level = 1;
break;
case ActSeeForInsTch: case ActSeePstForInsTch:
@ -1586,7 +1586,7 @@ void For_SetForumTypeAndRestrictAccess (void)
case ActCutThrForInsTch: case ActPasThrForInsTch:
case ActDelPstForInsTch:
case ActEnbPstForInsTch: case ActDisPstForInsTch:
Gbl.Forum.ForumType = For_FORUM_INSTITUTION_TCHS;
Gbl.Forum.ForumType = For_FORUM_INSTIT_TCHS;
Gbl.Forum.Level = 1;
break;
case ActSeeForCtrUsr: case ActSeePstForCtrUsr:
@ -1672,11 +1672,11 @@ void For_SetForumTypeAndRestrictAccess (void)
ICanSeeForum = (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM ||
Rol_GetMyMaxRoleInCtr (Gbl.Forum.Ctr.CtrCod) >= Rol_TEACHER);
break;
case For_FORUM_INSTITUTION_USRS:
case For_FORUM_INSTIT_USRS:
ICanSeeForum = (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM ||
Rol_GetMyMaxRoleInIns (Gbl.Forum.Ins.InsCod) >= Rol_STUDENT);
break;
case For_FORUM_INSTITUTION_TCHS:
case For_FORUM_INSTIT_TCHS:
ICanSeeForum = (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM ||
Rol_GetMyMaxRoleInIns (Gbl.Forum.Ins.InsCod) >= Rol_TEACHER);
break;
@ -1977,13 +1977,13 @@ static long For_WriteLinksToInsForums (long InsCod,bool IsLastIns,bool IsLastIte
/***** Link to the forum of users from this institution *****/
IsLastItemInLevel[1] = (IsLastIns && !ICanSeeTeacherForum);
For_WriteLinkToAForum (For_FORUM_INSTITUTION_USRS,false,1,IsLastItemInLevel);
For_WriteLinkToAForum (For_FORUM_INSTIT_USRS,false,1,IsLastItemInLevel);
/***** Link to forum of teachers from this institution *****/
if (ICanSeeTeacherForum)
{
IsLastItemInLevel[1] = IsLastIns;
For_WriteLinkToAForum (For_FORUM_INSTITUTION_TCHS,false,1,IsLastItemInLevel);
For_WriteLinkToAForum (For_FORUM_INSTIT_TCHS,false,1,IsLastItemInLevel);
}
}
return InsCod;
@ -2123,8 +2123,8 @@ static void For_WriteLinkToAForum (For_ForumType_t ForumType,bool ShowNumOfPosts
Gbl.Prefs.IconsURL,
ForumName,ForumName);
break;
case For_FORUM_INSTITUTION_USRS:
case For_FORUM_INSTITUTION_TCHS:
case For_FORUM_INSTIT_USRS:
case For_FORUM_INSTIT_TCHS:
case For_FORUM_CENTRE_USRS:
case For_FORUM_CENTRE_TCHS:
case For_FORUM_DEGREE_USRS:
@ -2186,10 +2186,10 @@ void For_SetForumName (For_ForumType_t ForumType,
UseHTMLEntities ? Txt_only_teachers :
Txt_only_teachers_NO_HTML[Language]);
break;
case For_FORUM_INSTITUTION_USRS:
case For_FORUM_INSTIT_USRS:
strcpy (ForumName,Ins->ShortName);
break;
case For_FORUM_INSTITUTION_TCHS:
case For_FORUM_INSTIT_TCHS:
sprintf (ForumName,"%s%s",Ins->ShortName,
UseHTMLEntities ? Txt_only_teachers :
Txt_only_teachers_NO_HTML[Language]);
@ -2278,8 +2278,8 @@ static void For_WriteLinkToForum (For_ForumType_t ForumType,Act_Action_t NextAct
Act_LinkFormSubmit (Act_GetActionTextFromDB (Act_Actions[NextAct].ActCod,ActTxt),Style,NULL);
switch (ForumType)
{
case For_FORUM_INSTITUTION_USRS:
case For_FORUM_INSTITUTION_TCHS:
case For_FORUM_INSTIT_USRS:
case For_FORUM_INSTIT_TCHS:
Log_DrawLogo (Sco_SCOPE_INS,Gbl.Forum.Ins.InsCod,ForumName,20,NULL,true);
break;
case For_FORUM_CENTRE_USRS:
@ -2327,8 +2327,8 @@ unsigned For_GetNumThrsWithNewPstsInForum (For_ForumType_t ForumType,unsigned Nu
/***** Get last time I read this forum from database *****/
switch (ForumType)
{
case For_FORUM_INSTITUTION_USRS:
case For_FORUM_INSTITUTION_TCHS:
case For_FORUM_INSTIT_USRS:
case For_FORUM_INSTIT_TCHS:
sprintf (SubQuery," AND forum_thread.Location='%ld'",
Gbl.Forum.Ins.InsCod);
break;
@ -2385,8 +2385,8 @@ static unsigned For_GetNumOfThreadsInForumNewerThan (For_ForumType_t ForumType,c
> specified time from database *****/
switch (ForumType)
{
case For_FORUM_INSTITUTION_USRS:
case For_FORUM_INSTITUTION_TCHS:
case For_FORUM_INSTIT_USRS:
case For_FORUM_INSTIT_TCHS:
sprintf (SubQuery," AND forum_thread.Location='%ld'",
Gbl.Forum.Ins.InsCod);
break;
@ -2507,8 +2507,8 @@ void For_ShowForumThrs (void)
/***** Get threads of a forum from database *****/
switch (Gbl.Forum.ForumType)
{
case For_FORUM_INSTITUTION_USRS:
case For_FORUM_INSTITUTION_TCHS:
case For_FORUM_INSTIT_USRS:
case For_FORUM_INSTIT_TCHS:
sprintf (SubQuery," AND forum_thread.Location='%ld'",
Gbl.Forum.Ins.InsCod);
break;
@ -2745,7 +2745,7 @@ unsigned For_GetNumTotalForumsOfType (For_ForumType_t ForumType,
case For_FORUM_SWAD_USRS: case For_FORUM_SWAD_TCHS:
case For_FORUM_GLOBAL_USRS: case For_FORUM_GLOBAL_TCHS:
return 1; // Only one forum
case For_FORUM_INSTITUTION_USRS: case For_FORUM_INSTITUTION_TCHS:
case For_FORUM_INSTIT_USRS: case For_FORUM_INSTIT_TCHS:
if (InsCod > 0) // InsCod > 0 ==> 0 <= number of institutions forums for an institution <= 1
sprintf (Query,"SELECT COUNT(DISTINCT Location)"
" FROM forum_thread"
@ -2913,7 +2913,7 @@ unsigned For_GetNumTotalThrsInForumsOfType (For_ForumType_t ForumType,
" WHERE ForumType='%u'",
(unsigned) ForumType);
break;
case For_FORUM_INSTITUTION_USRS: case For_FORUM_INSTITUTION_TCHS:
case For_FORUM_INSTIT_USRS: case For_FORUM_INSTIT_TCHS:
if (InsCod > 0) // InsCod > 0 ==> Number of threads in institution forums for an institution
sprintf (Query,"SELECT COUNT(*)"
" FROM forum_thread"
@ -3061,7 +3061,7 @@ unsigned For_GetNumThrsInForum (For_ForumType_t ForumType)
/***** Get number of threads in a forum from database *****/
switch (ForumType)
{
case For_FORUM_INSTITUTION_USRS: case For_FORUM_INSTITUTION_TCHS:
case For_FORUM_INSTIT_USRS: case For_FORUM_INSTIT_TCHS:
sprintf (SubQuery," AND Location='%ld'",Gbl.Forum.Ins.InsCod);
break;
case For_FORUM_CENTRE_USRS: case For_FORUM_CENTRE_TCHS:
@ -3107,7 +3107,7 @@ unsigned For_GetNumTotalPstsInForumsOfType (For_ForumType_t ForumType,
" AND forum_thread.ThrCod=forum_post.ThrCod",
(unsigned) ForumType);
break;
case For_FORUM_INSTITUTION_USRS: case For_FORUM_INSTITUTION_TCHS:
case For_FORUM_INSTIT_USRS: case For_FORUM_INSTIT_TCHS:
if (InsCod > 0) // InsCod > 0 ==> Number of posts in institutions forums for an institution
sprintf (Query,"SELECT COUNT(*),SUM(forum_post.NumNotif)"
" FROM forum_thread,forum_post"
@ -3294,7 +3294,7 @@ unsigned For_GetNumPstsInForum (For_ForumType_t ForumType)
/***** Get number of posts in a forum from database *****/
switch (ForumType)
{
case For_FORUM_INSTITUTION_USRS: case For_FORUM_INSTITUTION_TCHS:
case For_FORUM_INSTIT_USRS: case For_FORUM_INSTIT_TCHS:
sprintf (SubQuery," AND forum_thread.Location='%ld'",Gbl.Forum.Ins.InsCod);
break;
case For_FORUM_CENTRE_USRS: case For_FORUM_CENTRE_TCHS:
@ -4297,7 +4297,7 @@ bool For_CheckIfThrBelongsToForum (long ThrCod,For_ForumType_t ForumType)
/***** Get if a thread belong to current forum from database *****/
switch (ForumType)
{
case For_FORUM_INSTITUTION_USRS: case For_FORUM_INSTITUTION_TCHS:
case For_FORUM_INSTIT_USRS: case For_FORUM_INSTIT_TCHS:
sprintf (SubQuery," AND forum_thread.Location='%ld'",Gbl.Forum.Ins.InsCod);
break;
case For_FORUM_CENTRE_USRS: case For_FORUM_CENTRE_TCHS:
@ -4334,7 +4334,7 @@ void For_MoveThrToCurrentForum (long ThrCod)
sprintf (Query,"UPDATE forum_thread SET ForumType='%u',Location='-1' WHERE ThrCod='%ld'",
(unsigned) Gbl.Forum.ForumType,ThrCod);
break;
case For_FORUM_INSTITUTION_USRS: case For_FORUM_INSTITUTION_TCHS:
case For_FORUM_INSTIT_USRS: case For_FORUM_INSTIT_TCHS:
sprintf (Query,"UPDATE forum_thread SET ForumType='%u',Location='%ld' WHERE ThrCod='%ld'",
(unsigned) Gbl.Forum.ForumType,Gbl.Forum.Ins.InsCod,ThrCod);
break;
@ -4417,80 +4417,76 @@ void For_RemoveUsrFromThrClipboard (long UsrCod)
/********** Remove all the threads and posts in forums of a degree ***********/
/*****************************************************************************/
void For_RemoveDegForums (long DegCod)
void For_RemoveForums (Sco_Scope_t Scope,long Cod)
{
static const struct
{
For_ForumType_t Usrs;
For_ForumType_t Tchs;
} ForumType[Sco_NUM_SCOPES] =
{
{For_FORUM_GLOBAL_USRS,For_FORUM_GLOBAL_TCHS}, // Sco_SCOPE_UNK // No forums for this scope
{For_FORUM_GLOBAL_USRS,For_FORUM_GLOBAL_TCHS}, // Sco_SCOPE_SYS // Not removable
{For_FORUM_GLOBAL_USRS,For_FORUM_GLOBAL_TCHS}, // Sco_SCOPE_CTY // No forums for this scope
{For_FORUM_INSTIT_USRS,For_FORUM_INSTIT_TCHS}, // Sco_SCOPE_INS
{For_FORUM_CENTRE_USRS,For_FORUM_CENTRE_TCHS}, // Sco_SCOPE_CTR
{For_FORUM_DEGREE_USRS,For_FORUM_DEGREE_TCHS}, // Sco_SCOPE_DEG
{For_FORUM_COURSE_USRS,For_FORUM_COURSE_TCHS}, // Sco_SCOPE_CRS
};
char Query[512];
/***** Remove disabled posts *****/
sprintf (Query,"DELETE FROM forum_disabled_post"
" USING forum_thread,forum_post,forum_disabled_post"
" WHERE (forum_thread.ForumType='%u' OR forum_thread.ForumType='%u')"
" AND forum_thread.Location='%ld' AND forum_thread.ThrCod=forum_post.ThrCod AND forum_post.PstCod=forum_disabled_post.PstCod",
For_FORUM_DEGREE_USRS,For_FORUM_DEGREE_TCHS,DegCod);
DB_QueryDELETE (Query,"can not remove the disabled posts in forums of a degree");
" WHERE"
" (forum_thread.ForumType='%u'"
" OR"
" forum_thread.ForumType='%u')"
" AND forum_thread.Location='%ld'"
" AND forum_thread.ThrCod=forum_post.ThrCod"
" AND forum_post.PstCod=forum_disabled_post.PstCod",
ForumType[Scope].Usrs,
ForumType[Scope].Tchs,
Cod);
DB_QueryDELETE (Query,"can not remove the disabled posts in forums");
/***** Remove posts *****/
sprintf (Query,"DELETE FROM forum_post"
" USING forum_thread,forum_post"
" WHERE (forum_thread.ForumType='%u' OR forum_thread.ForumType='%u')"
" AND forum_thread.Location='%ld' AND forum_thread.ThrCod=forum_post.ThrCod",
For_FORUM_DEGREE_USRS,For_FORUM_DEGREE_TCHS,DegCod);
DB_QueryDELETE (Query,"can not remove posts in forums of a degree");
" WHERE"
" (forum_thread.ForumType='%u'"
" OR"
" forum_thread.ForumType='%u')"
" AND forum_thread.Location='%ld'"
" AND forum_thread.ThrCod=forum_post.ThrCod",
ForumType[Scope].Usrs,
ForumType[Scope].Tchs,
Cod);
DB_QueryDELETE (Query,"can not remove posts in forums");
/***** Remove threads read *****/
sprintf (Query,"DELETE FROM forum_thr_read"
" USING forum_thread,forum_thr_read"
" WHERE (forum_thread.ForumType='%u' OR forum_thread.ForumType='%u')"
" AND forum_thread.Location='%ld' AND forum_thread.ThrCod=forum_thr_read.ThrCod",
For_FORUM_DEGREE_USRS,For_FORUM_DEGREE_TCHS,DegCod);
DB_QueryDELETE (Query,"can not remove read threads in forums of a degree");
/***** Remove threads *****/
sprintf (Query,"DELETE FROM forum_thread"
" WHERE (forum_thread.ForumType='%u' OR forum_thread.ForumType='%u')"
" AND Location='%ld'",
For_FORUM_DEGREE_USRS,For_FORUM_DEGREE_TCHS,DegCod);
DB_QueryDELETE (Query,"can not remove threads in forums of a degree");
}
/*****************************************************************************/
/********** Remove all the threads and posts in forums of a course ***********/
/*****************************************************************************/
void For_RemoveCrsForums (long CrsCod)
{
char Query[512];
/***** Remove disabled posts *****/
sprintf (Query,"DELETE FROM forum_disabled_post"
" USING forum_thread,forum_post,forum_disabled_post"
" WHERE (forum_thread.ForumType='%u' OR forum_thread.ForumType='%u')"
" AND forum_thread.Location='%ld'"
" AND forum_thread.ThrCod=forum_post.ThrCod"
" AND forum_post.PstCod=forum_disabled_post.PstCod",
For_FORUM_COURSE_USRS,For_FORUM_COURSE_TCHS,CrsCod);
DB_QueryDELETE (Query,"can not remove disabled posts in forums of a course");
/***** Remove posts *****/
sprintf (Query,"DELETE FROM forum_post USING forum_thread,forum_post"
" WHERE (forum_thread.ForumType='%u' OR forum_thread.ForumType='%u')"
" AND forum_thread.Location='%ld'"
" AND forum_thread.ThrCod=forum_post.ThrCod",
For_FORUM_COURSE_USRS,For_FORUM_COURSE_TCHS,CrsCod);
DB_QueryDELETE (Query,"can not remove posts in forums of a course");
/***** Remove threads read *****/
sprintf (Query,"DELETE FROM forum_thr_read USING forum_thread,forum_thr_read"
" WHERE (forum_thread.ForumType='%u' OR forum_thread.ForumType='%u')"
" WHERE"
" (forum_thread.ForumType='%u'"
" OR"
" forum_thread.ForumType='%u')"
" AND forum_thread.Location='%ld'"
" AND forum_thread.ThrCod=forum_thr_read.ThrCod",
For_FORUM_COURSE_USRS,For_FORUM_COURSE_TCHS,CrsCod);
DB_QueryDELETE (Query,"can not remove read threads in forums of a course");
ForumType[Scope].Usrs,
ForumType[Scope].Tchs,
Cod);
DB_QueryDELETE (Query,"can not remove read threads in forums");
/***** Remove threads *****/
sprintf (Query,"DELETE FROM forum_thread"
" WHERE (forum_thread.ForumType='%u' OR forum_thread.ForumType='%u')"
" WHERE"
" (forum_thread.ForumType='%u'"
" OR"
" forum_thread.ForumType='%u')"
" AND Location='%ld'",
For_FORUM_COURSE_USRS,For_FORUM_COURSE_TCHS,CrsCod);
DB_QueryDELETE (Query,"can not remove threads in forums of a course");
ForumType[Scope].Usrs,
ForumType[Scope].Tchs,
Cod);
DB_QueryDELETE (Query,"can not remove threads in forums");
}

8
swad_forum.h
View File

@ -31,6 +31,7 @@
#include "swad_degree.h"
#include "swad_institution.h"
#include "swad_pagination.h"
#include "swad_scope.h"
#include "swad_string.h"
/*****************************************************************************/
@ -54,8 +55,8 @@ typedef enum
For_FORUM_DEGREE_TCHS = 3,
For_FORUM_CENTRE_USRS = 4,
For_FORUM_CENTRE_TCHS = 5,
For_FORUM_INSTITUTION_USRS = 6,
For_FORUM_INSTITUTION_TCHS = 7,
For_FORUM_INSTIT_USRS = 6,
For_FORUM_INSTIT_TCHS = 7,
For_FORUM_GLOBAL_USRS = 8,
For_FORUM_GLOBAL_TCHS = 9,
For_FORUM_SWAD_USRS = 10,
@ -140,7 +141,6 @@ void For_RemoveExpiredThrsClipboards (void);
void For_RemoveThrCodFromThrClipboard (long ThrCod);
void For_RemoveUsrFromThrClipboard (long UsrCod);
void For_RemoveDegForums (long DegCod);
void For_RemoveCrsForums (long CrsCod);
void For_RemoveForums (Sco_Scope_t Scope,long DegCod);
#endif

16
swad_statistic.c
View File

@ -7315,8 +7315,8 @@ static void Sta_GetAndShowForumStats (void)
Sta_ShowStatOfAForumType (For_FORUM_GLOBAL_TCHS ,-1L,-1L,-1L,-1L,-1L,&StatsForum);
Sta_ShowStatOfAForumType (For_FORUM_SWAD_USRS ,-1L,-1L,-1L,-1L,-1L,&StatsForum);
Sta_ShowStatOfAForumType (For_FORUM_SWAD_TCHS ,-1L,-1L,-1L,-1L,-1L,&StatsForum);
Sta_ShowStatOfAForumType (For_FORUM_INSTITUTION_USRS,-1L,-1L,-1L,-1L,-1L,&StatsForum);
Sta_ShowStatOfAForumType (For_FORUM_INSTITUTION_TCHS,-1L,-1L,-1L,-1L,-1L,&StatsForum);
Sta_ShowStatOfAForumType (For_FORUM_INSTIT_USRS,-1L,-1L,-1L,-1L,-1L,&StatsForum);
Sta_ShowStatOfAForumType (For_FORUM_INSTIT_TCHS,-1L,-1L,-1L,-1L,-1L,&StatsForum);
Sta_ShowStatOfAForumType (For_FORUM_CENTRE_USRS ,-1L,-1L,-1L,-1L,-1L,&StatsForum);
Sta_ShowStatOfAForumType (For_FORUM_CENTRE_TCHS ,-1L,-1L,-1L,-1L,-1L,&StatsForum);
Sta_ShowStatOfAForumType (For_FORUM_DEGREE_USRS ,-1L,-1L,-1L,-1L,-1L,&StatsForum);
@ -7325,8 +7325,8 @@ static void Sta_GetAndShowForumStats (void)
Sta_ShowStatOfAForumType (For_FORUM_COURSE_TCHS ,-1L,-1L,-1L,-1L,-1L,&StatsForum);
break;
case Sco_SCOPE_CTY:
Sta_ShowStatOfAForumType (For_FORUM_INSTITUTION_USRS,Gbl.CurrentCty.Cty.CtyCod,-1L,-1L,-1L,-1L,&StatsForum);
Sta_ShowStatOfAForumType (For_FORUM_INSTITUTION_TCHS,Gbl.CurrentCty.Cty.CtyCod,-1L,-1L,-1L,-1L,&StatsForum);
Sta_ShowStatOfAForumType (For_FORUM_INSTIT_USRS,Gbl.CurrentCty.Cty.CtyCod,-1L,-1L,-1L,-1L,&StatsForum);
Sta_ShowStatOfAForumType (For_FORUM_INSTIT_TCHS,Gbl.CurrentCty.Cty.CtyCod,-1L,-1L,-1L,-1L,&StatsForum);
Sta_ShowStatOfAForumType (For_FORUM_CENTRE_USRS ,Gbl.CurrentCty.Cty.CtyCod,-1L,-1L,-1L,-1L,&StatsForum);
Sta_ShowStatOfAForumType (For_FORUM_CENTRE_TCHS ,Gbl.CurrentCty.Cty.CtyCod,-1L,-1L,-1L,-1L,&StatsForum);
Sta_ShowStatOfAForumType (For_FORUM_DEGREE_USRS ,Gbl.CurrentCty.Cty.CtyCod,-1L,-1L,-1L,-1L,&StatsForum);
@ -7335,8 +7335,8 @@ static void Sta_GetAndShowForumStats (void)
Sta_ShowStatOfAForumType (For_FORUM_COURSE_TCHS ,Gbl.CurrentCty.Cty.CtyCod,-1L,-1L,-1L,-1L,&StatsForum);
break;
case Sco_SCOPE_INS:
Sta_ShowStatOfAForumType (For_FORUM_INSTITUTION_USRS,-1L,Gbl.CurrentIns.Ins.InsCod,-1L,-1L,-1L,&StatsForum);
Sta_ShowStatOfAForumType (For_FORUM_INSTITUTION_TCHS,-1L,Gbl.CurrentIns.Ins.InsCod,-1L,-1L,-1L,&StatsForum);
Sta_ShowStatOfAForumType (For_FORUM_INSTIT_USRS,-1L,Gbl.CurrentIns.Ins.InsCod,-1L,-1L,-1L,&StatsForum);
Sta_ShowStatOfAForumType (For_FORUM_INSTIT_TCHS,-1L,Gbl.CurrentIns.Ins.InsCod,-1L,-1L,-1L,&StatsForum);
Sta_ShowStatOfAForumType (For_FORUM_CENTRE_USRS ,-1L,Gbl.CurrentIns.Ins.InsCod,-1L,-1L,-1L,&StatsForum);
Sta_ShowStatOfAForumType (For_FORUM_CENTRE_TCHS ,-1L,Gbl.CurrentIns.Ins.InsCod,-1L,-1L,-1L,&StatsForum);
Sta_ShowStatOfAForumType (For_FORUM_DEGREE_USRS ,-1L,Gbl.CurrentIns.Ins.InsCod,-1L,-1L,-1L,&StatsForum);
@ -7420,12 +7420,12 @@ static void Sta_ShowStatOfAForumType (For_ForumType_t ForumType,
"ctr64x64.gif",StatsForum,
Txt_Centres,Txt_only_teachers);
break;
case For_FORUM_INSTITUTION_USRS:
case For_FORUM_INSTIT_USRS:
Sta_WriteForumTitleAndStats (ForumType,CtyCod,InsCod,CtrCod,DegCod,CrsCod,
"ins64x64.gif",StatsForum,
Txt_Institutions,"");
break;
case For_FORUM_INSTITUTION_TCHS:
case For_FORUM_INSTIT_TCHS:
Sta_WriteForumTitleAndStats (ForumType,CtyCod,InsCod,CtrCod,DegCod,CrsCod,
"ins64x64.gif",StatsForum,
Txt_Institutions,Txt_only_teachers);