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

This commit is contained in:
Antonio Cañas Vargas 2017-04-16 13:54:02 +02:00
parent 7508be0542
commit fdd3c04038
2 changed files with 37 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -214,13 +214,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.178 (2017-04-16)"
#define Log_PLATFORM_VERSION "SWAD 16.178.1 (2017-04-16)"
#define CSS_FILE "swad16.177.css"
#define JS_FILE "swad16.144.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.178.1: Apr 16, 2017 Code refactoring in forums (217601 lines)
Version 16.178: Apr 16, 2017 Code refactoring in forums (217595 lines)
Version 16.177.4: Apr 14, 2017 Changes in layout of forums. (217611 lines)
Version 16.177.3: Apr 14, 2017 Highlight current thread in forums. (217609 lines)

65
swad_forum.c
View File

@ -3568,6 +3568,41 @@ static void For_GetParamsForum (void)
/***** Set forum type *****/
For_SetForumType ();
/***** Get parameter with code of course, degree, centre or institution *****/
switch (Gbl.Forum.Type)
{
case For_FORUM_COURSE_USRS:
case For_FORUM_COURSE_TCHS:
/* Get parameter with code of course */
Gbl.Forum.Crs.CrsCod = Par_GetParToLong ("ForCrsCod");
Crs_GetDataOfCourseByCod (&Gbl.Forum.Crs);
Gbl.Forum.Cod = Gbl.Forum.Crs.CrsCod;
break;
case For_FORUM_DEGREE_USRS:
case For_FORUM_DEGREE_TCHS:
/* Get parameter with code of degree */
Gbl.Forum.Deg.DegCod = Par_GetParToLong ("ForDegCod");
Deg_GetDataOfDegreeByCod (&Gbl.Forum.Deg);
Gbl.Forum.Cod = Gbl.Forum.Deg.DegCod;
break;
case For_FORUM_CENTRE_USRS:
case For_FORUM_CENTRE_TCHS:
/* Get parameter with code of centre */
Gbl.Forum.Ctr.CtrCod = Par_GetParToLong ("ForCtrCod");
Ctr_GetDataOfCentreByCod (&Gbl.Forum.Ctr);
Gbl.Forum.Cod = Gbl.Forum.Ctr.CtrCod;
break;
case For_FORUM_INSTIT_USRS:
case For_FORUM_INSTIT_TCHS:
/* Get parameter with code of institution */
Gbl.Forum.Ins.InsCod = Par_GetParToLong ("ForInsCod");
Ins_GetDataOfInstitutionByCod (&Gbl.Forum.Ins,Ins_GET_BASIC_DATA);
Gbl.Forum.Cod = Gbl.Forum.Ins.InsCod;
break;
default:
break;
}
/***** Get which forums I want to see *****/
Gbl.Forum.WhichForums = (For_WhichForums_t)
Par_GetParToUnsignedLong ("WhichForum",
@ -3582,36 +3617,6 @@ static void For_GetParamsForum (void)
For_NUM_ORDERS - 1,
(unsigned long) For_DEFAULT_ORDER);
/***** Get parameter with code of course *****/
Gbl.Forum.Crs.CrsCod = Par_GetParToLong ("ForCrsCod");
Crs_GetDataOfCourseByCod (&Gbl.Forum.Crs);
if (Gbl.Forum.Crs.CrsCod > 0)
Gbl.Forum.Cod = Gbl.Forum.Crs.CrsCod;
else
{
/***** Get parameter with code of degree *****/
Gbl.Forum.Deg.DegCod = Par_GetParToLong ("ForDegCod");
Deg_GetDataOfDegreeByCod (&Gbl.Forum.Deg);
if (Gbl.Forum.Deg.DegCod > 0)
Gbl.Forum.Cod = Gbl.Forum.Deg.DegCod;
else
{
/***** Get parameter with code of institution *****/
Gbl.Forum.Ctr.CtrCod = Par_GetParToLong ("ForCtrCod");
Ctr_GetDataOfCentreByCod (&Gbl.Forum.Ctr);
if (Gbl.Forum.Ctr.CtrCod > 0)
Gbl.Forum.Cod = Gbl.Forum.Ctr.CtrCod;
else
{
/***** Get parameter with code of institution *****/
Gbl.Forum.Ins.InsCod = Par_GetParToLong ("ForInsCod");
Ins_GetDataOfInstitutionByCod (&Gbl.Forum.Ins,Ins_GET_BASIC_DATA);
if (Gbl.Forum.Ins.InsCod > 0)
Gbl.Forum.Cod = Gbl.Forum.Ins.InsCod;
}
}
}
/***** Restrict access to forum *****/
For_RestrictAccess ();
}