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 22.54: Oct 28, 2022 Code refactoring and bug fixing in institutional links.

This commit is contained in:
acanas 2022-10-28 14:44:48 +02:00
parent 0940ab845e
commit 03ed699c83
8 changed files with 72 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -605,7 +605,7 @@ TODO: Fix bug: error al enviar un mensaje a dos recipientes, error on duplicate
TODO: Attach pdf files in multimedia.
*/
#define Log_PLATFORM_VERSION "SWAD 22.53 (2022-10-28)"
#define Log_PLATFORM_VERSION "SWAD 22.54 (2022-10-28)"
#define CSS_FILE "swad22.49.4.css"
#define JS_FILE "swad22.49.js"
/*
@ -616,6 +616,7 @@ Que al subir un fichero por defecto est
Al subir cosas para los grupos, en documentos, resltar más los grupos porque no son conscientes...
Exportar listas en CSV.
Version 22.54: Oct 28, 2022 Code refactoring and bug fixing in institutional links. (333614 lines)
Version 22.53: Oct 28, 2022 Code refactoring in mail domains. (333607 lines)
Version 22.52: Oct 28, 2022 Code refactoring in plugins. (333589 lines)
Version 22.51: Oct 27, 2022 New module swad_process. (333586 lines)

4
swad_global.c
View File

@ -228,9 +228,6 @@ void Gbl_InitializeGlobals (void)
Gbl.Search.Str[0] = '\0';
Gbl.Search.LogSearch = false;
Gbl.Links.Num = 0;
Gbl.Links.Lst = NULL;
Gbl.Usrs.Listing.RecsUsrs = Rec_RECORD_USERS_UNKNOWN;
Gbl.Usrs.Listing.RecsPerPag = Rec_DEF_RECORDS_PER_PAGE;
Gbl.Usrs.Listing.WithPhotos = Usr_LIST_WITH_PHOTOS_DEF;
@ -321,7 +318,6 @@ void Gbl_Cleanup (void)
Ins_FreeListInstitutions ();
Ctr_FreeListCenters ();
Cty_FreeListCountries ();
Lnk_FreeListLinks ();
for (Role = (Rol_Role_t) 0;
Role <= (Rol_Role_t) (Rol_NUM_ROLES - 1);

5
swad_global.h
View File

@ -105,11 +105,6 @@ struct Globals
unsigned Num; // Number of degree types
struct DegreeType *Lst; // List of degree types
} DegTypes;
struct
{
unsigned Num; // Number of institutional links
struct Lnk_Link *Lst; // List of institutional links
} Links;
struct
{
Sch_WhatToSearch_t WhatToSearch;

92
swad_link.c
View File

@ -49,6 +49,16 @@
extern struct Globals Gbl;
/*****************************************************************************/
/******************************* Private types *******************************/
/*****************************************************************************/
struct Lnk_Links
{
unsigned Num; // Number of institutional links
struct Lnk_Link *Lst; // List of institutional links
};
/*****************************************************************************/
/***************************** Private variables *****************************/
/*****************************************************************************/
@ -61,14 +71,17 @@ static struct Lnk_Link *Lnk_EditingLnk = NULL; // Static variable to keep the li
static void Lnk_PutIconsListingLinks (__attribute__((unused)) void *Args);
static void Lnk_PutIconToEditLinks (void);
static void Lnk_WriteListOfLinks (const char *Class);
static void Lnk_WriteListOfLinks (const struct Lnk_Links *Links,const char *Class);
static void Lnk_EditLinksInternal (void);
static void Lnk_PutIconsEditingLinks (__attribute__((unused)) void *Args);
static void Lnk_GetListLinks (struct Lnk_Links *Links);
static void Lnk_GetDataOfLink (MYSQL_RES *mysql_res,struct Lnk_Link *Lnk);
static void Lnk_ListLinksForEdition (void);
static void Lnk_FreeListLinks (struct Lnk_Links *Links);
static void Lnk_ListLinksForEdition (const struct Lnk_Links *Links);
static void Lnk_PutParamLnkCod (void *LnkCod);
static void Lnk_RenameLink (Cns_ShrtOrFullName_t ShrtOrFullName);
@ -89,9 +102,10 @@ void Lnk_SeeLinks (void)
extern const char *Txt_Links;
extern const char *Txt_No_links;
extern const char *Txt_New_link;
struct Lnk_Links Links;
/***** Get list of links *****/
Lnk_GetListLinks ();
Lnk_GetListLinks (&Links);
/***** Begin box *****/
Box_BoxBegin (NULL,Txt_Links,
@ -99,8 +113,8 @@ void Lnk_SeeLinks (void)
Hlp_SYSTEM_Links,Box_NOT_CLOSABLE);
/***** Write all links *****/
if (Gbl.Links.Num) // There are links
Lnk_WriteListOfLinks ("class=\"LIST_LEFT\"");
if (Links.Num) // There are links
Lnk_WriteListOfLinks (&Links,"class=\"LIST_LEFT\"");
else // No links created
Ale_ShowAlert (Ale_INFO,Txt_No_links);
@ -116,7 +130,7 @@ void Lnk_SeeLinks (void)
Box_BoxEnd ();
/***** Free list of links *****/
Lnk_FreeListLinks ();
Lnk_FreeListLinks (&Links);
}
/*****************************************************************************/
@ -150,12 +164,13 @@ static void Lnk_PutIconToEditLinks (void)
void Lnk_WriteMenuWithInstitutionalLinks (void)
{
extern const char *Txt_Links;
struct Lnk_Links Links;
/***** Get list of links *****/
Lnk_GetListLinks ();
Lnk_GetListLinks (&Links);
/***** Write all links *****/
if (Gbl.Links.Num)
if (Links.Num)
{
HTM_DIV_Begin ("id=\"institutional_links\" class=\"INS_LNK_%s\"",
The_GetSuffix ());
@ -166,20 +181,20 @@ void Lnk_WriteMenuWithInstitutionalLinks (void)
HTM_BUTTON_End ();
Frm_EndForm ();
Lnk_WriteListOfLinks (NULL);
Lnk_WriteListOfLinks (&Links,NULL);
HTM_DIV_End ();
}
/***** Free list of links *****/
Lnk_FreeListLinks ();
Lnk_FreeListLinks (&Links);
}
/*****************************************************************************/
/*************************** Write list of links *****************************/
/*****************************************************************************/
static void Lnk_WriteListOfLinks (const char *Class)
static void Lnk_WriteListOfLinks (const struct Lnk_Links *Links,const char *Class)
{
unsigned NumLnk;
@ -188,17 +203,17 @@ static void Lnk_WriteListOfLinks (const char *Class)
/***** Write all links *****/
for (NumLnk = 0;
NumLnk < Gbl.Links.Num;
NumLnk < Links->Num;
NumLnk++)
{
/* Write data of this link */
HTM_LI_Begin ("class=\"ICO_HIGHLIGHT INS_LNK\"");
HTM_A_Begin ("href=\"%s\" title=\"%s\""
" class=\"INS_LNK_%s\" target=\"_blank\"",
Gbl.Links.Lst[NumLnk].WWW,
Gbl.Links.Lst[NumLnk].FullName,
Links->Lst[NumLnk].WWW,
Links->Lst[NumLnk].FullName,
The_GetSuffix ());
HTM_Txt (Gbl.Links.Lst[NumLnk].ShrtName);
HTM_Txt (Links->Lst[NumLnk].ShrtName);
HTM_A_End ();
HTM_LI_End ();
}
@ -227,9 +242,10 @@ static void Lnk_EditLinksInternal (void)
{
extern const char *Hlp_SYSTEM_Links_edit;
extern const char *Txt_Links;
struct Lnk_Links Links;
/***** Get list of links *****/
Lnk_GetListLinks ();
Lnk_GetListLinks (&Links);
/***** Begin box *****/
Box_BoxBegin (NULL,Txt_Links,
@ -240,14 +256,14 @@ static void Lnk_EditLinksInternal (void)
Lnk_PutFormToCreateLink ();
/***** Forms to edit current links *****/
if (Gbl.Links.Num)
Lnk_ListLinksForEdition ();
if (Links.Num)
Lnk_ListLinksForEdition (&Links);
/***** End box *****/
Box_BoxEnd ();
/***** Free list of links *****/
Lnk_FreeListLinks ();
Lnk_FreeListLinks (&Links);
}
/*****************************************************************************/
@ -278,27 +294,31 @@ void Lnk_PutIconToViewLinks (void)
/****************************** List all links *******************************/
/*****************************************************************************/
void Lnk_GetListLinks (void)
static void Lnk_GetListLinks (struct Lnk_Links *Links)
{
MYSQL_RES *mysql_res;
unsigned NumLnk;
/***** Reset links *****/
Links->Num = 0;
Links->Lst = NULL;
if (DB_CheckIfDatabaseIsOpen ())
{
/***** Get institutional links from database *****/
if ((Gbl.Links.Num = Lnk_DB_GetLinks (&mysql_res))) // Links found...
if ((Links->Num = Lnk_DB_GetLinks (&mysql_res))) // Links found...
{
/***** Create list with places *****/
if ((Gbl.Links.Lst = calloc ((size_t) Gbl.Links.Num,
sizeof (*Gbl.Links.Lst))) == NULL)
if ((Links->Lst = calloc ((size_t) Links->Num,
sizeof (struct Lnk_Link))) == NULL)
Err_NotEnoughMemoryExit ();
/***** Get the links *****/
for (NumLnk = 0;
NumLnk < Gbl.Links.Num;
NumLnk < Links->Num;
NumLnk++)
/* Get next link */
Lnk_GetDataOfLink (mysql_res,&(Gbl.Links.Lst[NumLnk]));
Lnk_GetDataOfLink (mysql_res,&Links->Lst[NumLnk]);
}
/***** Free structure that stores the query result *****/
@ -347,6 +367,11 @@ static void Lnk_GetDataOfLink (MYSQL_RES *mysql_res,struct Lnk_Link *Lnk)
row[2] FullName
row[3] WWW
*/
/***** Get plugin code (row[0]) *****/
if ((Lnk->LnkCod = Str_ConvertStrCodToLongCod (row[0])) <= 0)
Err_WrongLinkExit ();
/***** Get the short name (row[1]),
the full name (row[2])
and the URL (row[3]) of the link *****/
@ -359,14 +384,13 @@ static void Lnk_GetDataOfLink (MYSQL_RES *mysql_res,struct Lnk_Link *Lnk)
/**************************** Free list of links *****************************/
/*****************************************************************************/
void Lnk_FreeListLinks (void)
static void Lnk_FreeListLinks (struct Lnk_Links *Links)
{
if (Gbl.Links.Lst)
if (Links->Num && Links->Lst)
{
/***** Free memory used by the list of links *****/
free (Gbl.Links.Lst);
Gbl.Links.Lst = NULL;
Gbl.Links.Num = 0;
free (Links->Lst);
Links->Lst = NULL;
Links->Num = 0;
}
}
@ -374,7 +398,7 @@ void Lnk_FreeListLinks (void)
/****************************** List all links *******************************/
/*****************************************************************************/
static void Lnk_ListLinksForEdition (void)
static void Lnk_ListLinksForEdition (const struct Lnk_Links *Links)
{
unsigned NumLnk;
struct Lnk_Link *Lnk;
@ -387,10 +411,10 @@ static void Lnk_ListLinksForEdition (void)
/***** Write all links *****/
for (NumLnk = 0;
NumLnk < Gbl.Links.Num;
NumLnk < Links->Num;
NumLnk++)
{
Lnk = &Gbl.Links.Lst[NumLnk];
Lnk = &Links->Lst[NumLnk];
HTM_TR_Begin (NULL);

2
swad_link.h
View File

@ -52,8 +52,6 @@ void Lnk_EditLinks (void);
void Lnk_PutIconToViewLinks (void);
void Lnk_GetListLinks (void);
void Lnk_FreeListLinks (void);
void Lnk_GetDataOfLinkByCod (struct Lnk_Link *Lnk);
long Lnk_GetParamLnkCod (void);
void Lnk_RemoveLink (void);

7
swad_link_database.c
View File

@ -97,9 +97,10 @@ unsigned Lnk_DB_GetDataOfLinkByCod (MYSQL_RES **mysql_res,long LnkCod)
{
return (unsigned)
DB_QuerySELECT (mysql_res,"can not get data of an institutional link",
"SELECT ShortName," // row[0]
"FullName," // row[1]
"WWW" // row[2]
"SELECT LnkCod," // row[0]
"ShortName," // row[1]
"FullName," // row[2]
"WWW" // row[3]
" FROM lnk_links"
" WHERE LnkCod=%ld",
LnkCod);

3
swad_mail.c
View File

@ -412,9 +412,8 @@ void Mai_GetDataOfMailDomainByCod (struct Mail *Mai)
static void Mai_FreeListMailDomains (struct Mai_Mails *Mails)
{
if (Mails->Lst)
if (Mails->Num && Mails->Lst)
{
/***** Free memory used by the list of mail domains *****/
free (Mails->Lst);
Mails->Lst = NULL;
Mails->Num = 0;

16
swad_plugin.c
View File

@ -240,7 +240,7 @@ static void Plg_GetListPlugins (struct Plg_Plugins *Plugins)
{
/***** Create list with plugins *****/
if ((Plugins->Lst = calloc ((size_t) Plugins->Num,
sizeof (*Plugins->Lst))) == NULL)
sizeof (struct Plg_Plugin))) == NULL)
Err_NotEnoughMemoryExit ();
/***** Get the plugins *****/
@ -328,14 +328,12 @@ bool Plg_GetDataOfPluginByCod (struct Plg_Plugin *Plg)
static void Plg_FreeListPlugins (struct Plg_Plugins *Plugins)
{
if (Plugins->Num)
if (Plugins->Lst)
{
/***** Free memory used by the list of plugins *****/
free (Plugins->Lst);
Plugins->Lst = NULL;
Plugins->Num = 0;
}
if (Plugins->Num && Plugins->Lst)
{
free (Plugins->Lst);
Plugins->Lst = NULL;
Plugins->Num = 0;
}
}
/*****************************************************************************/