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 20.50.4: Mar 17, 2021 Banners database table renamed.

This commit is contained in:
acanas 2021-03-17 00:28:19 +01:00
parent 986b7e6d11
commit 53ad44d741
4 changed files with 74 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sql/swad.sql
View File

@ -114,9 +114,9 @@ CREATE TABLE IF NOT EXISTS att_usr (
UNIQUE INDEX(AttCod,UsrCod), UNIQUE INDEX(AttCod,UsrCod),
INDEX(UsrCod)); INDEX(UsrCod));
-- --
-- Table banners: stores advertising banners -- Table ban_banners: stores advertising banners
-- --
CREATE TABLE IF NOT EXISTS banners ( CREATE TABLE IF NOT EXISTS ban_banners (
BanCod INT NOT NULL AUTO_INCREMENT, BanCod INT NOT NULL AUTO_INCREMENT,
Hidden ENUM('N','Y') NOT NULL DEFAULT 'N', Hidden ENUM('N','Y') NOT NULL DEFAULT 'N',
ShortName VARCHAR(511) NOT NULL, ShortName VARCHAR(511) NOT NULL,

89
swad_banner.c
View File

@ -141,8 +141,13 @@ void Ban_SeeBanners (void)
/***** Get list of banners *****/ /***** Get list of banners *****/
NumRows = DB_QuerySELECT (&mysql_res,"can not get banners", NumRows = DB_QuerySELECT (&mysql_res,"can not get banners",
"SELECT BanCod,Hidden,ShortName,FullName,Img,WWW" "SELECT BanCod," // row[0]
" FROM banners" "Hidden," // row[1]
"ShortName," // row[2]
"FullName," // row[3]
"Img," // row[4]
"WWW" // row[5]
" FROM ban_banners"
" WHERE Hidden='N'" " WHERE Hidden='N'"
" ORDER BY ShortName"); " ORDER BY ShortName");
Ban_GetListBanners (&Banners,&mysql_res,NumRows); Ban_GetListBanners (&Banners,&mysql_res,NumRows);
@ -257,8 +262,14 @@ static void Ban_EditBannersInternal (struct Ban_Banners *Banners,
/***** Get list of banners *****/ /***** Get list of banners *****/
NumRows = DB_QuerySELECT (&mysql_res,"can not get banners", NumRows = DB_QuerySELECT (&mysql_res,"can not get banners",
"SELECT BanCod,Hidden,ShortName,FullName,Img,WWW" "SELECT BanCod," // row[0]
" FROM banners ORDER BY ShortName"); "Hidden," // row[1]
"ShortName," // row[2]
"FullName," // row[3]
"Img," // row[4]
"WWW" // row[5]
" FROM ban_banners"
" ORDER BY ShortName");
Ban_GetListBanners (Banners,&mysql_res,NumRows); Ban_GetListBanners (Banners,&mysql_res,NumRows);
/***** Begin box *****/ /***** Begin box *****/
@ -351,8 +362,13 @@ void Ban_GetDataOfBannerByCod (struct Ban_Banner *Ban)
{ {
/***** Get data of a banner from database *****/ /***** Get data of a banner from database *****/
NumRows = DB_QuerySELECT (&mysql_res,"can not get data of a banner", NumRows = DB_QuerySELECT (&mysql_res,"can not get data of a banner",
"SELECT Hidden,ShortName,FullName,Img,WWW" "SELECT Hidden," // row[0]
" FROM banners WHERE BanCod=%ld", "ShortName," // row[1]
"FullName," // row[2]
"Img," // row[3]
"WWW" // row[4]
" FROM ban_banners"
" WHERE BanCod=%ld",
Ban->BanCod); Ban->BanCod);
if (NumRows) // Banner found... if (NumRows) // Banner found...
{ {
@ -566,7 +582,8 @@ void Ban_RemoveBanner (void)
/***** Remove banner *****/ /***** Remove banner *****/
DB_QueryDELETE ("can not remove a banner", DB_QueryDELETE ("can not remove a banner",
"DELETE FROM banners WHERE BanCod=%ld", "DELETE FROM ban_banners"
" WHERE BanCod=%ld",
Ban.BanCod); Ban.BanCod);
/***** Write message to show the change made *****/ /***** Write message to show the change made *****/
@ -630,7 +647,8 @@ static void Ban_ShowOrHideBanner (struct Ban_Banner *Ban,bool Hide)
/***** Mark file as hidden/visible in database *****/ /***** Mark file as hidden/visible in database *****/
if (Ban->Hidden != Hide) if (Ban->Hidden != Hide)
DB_QueryUPDATE ("can not change status of a banner in database", DB_QueryUPDATE ("can not change status of a banner in database",
"UPDATE banners SET Hidden='%c'" "UPDATE ban_banners"
" SET Hidden='%c'"
" WHERE BanCod=%ld", " WHERE BanCod=%ld",
Hide ? 'Y' : Hide ? 'Y' :
'N', 'N',
@ -758,11 +776,13 @@ static void Ban_RenameBanner (struct Ban_Banner *Ban,
static bool Ban_CheckIfBannerNameExists (const char *FieldName,const char *Name,long BanCod) static bool Ban_CheckIfBannerNameExists (const char *FieldName,const char *Name,long BanCod)
{ {
/***** Get number of banners with a name from database *****/ /***** Get number of banners with a name from database *****/
return (DB_QueryCOUNT ("can not check if the name of a banner" return (DB_QueryCOUNT ("can not check if the name of a banner already existed",
" already existed", "SELECT COUNT(*)"
"SELECT COUNT(*) FROM banners" " FROM ban_banners"
" WHERE %s='%s' AND BanCod<>%ld", " WHERE %s='%s'"
FieldName,Name,BanCod) != 0); " AND BanCod<>%ld",
FieldName,Name,
BanCod) != 0);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -774,8 +794,11 @@ static void Ban_UpdateBanNameDB (long BanCod,const char *FieldName,
{ {
/***** Update banner changing old name by new name *****/ /***** Update banner changing old name by new name *****/
DB_QueryUPDATE ("can not update the name of a banner", DB_QueryUPDATE ("can not update the name of a banner",
"UPDATE banners SET %s='%s' WHERE BanCod=%ld", "UPDATE ban_banners"
FieldName,NewBanName,BanCod); " SET %s='%s'"
" WHERE BanCod=%ld",
FieldName,NewBanName,
BanCod);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -808,8 +831,11 @@ void Ban_ChangeBannerImg (void)
{ {
/* Update the table changing old image by new image */ /* Update the table changing old image by new image */
DB_QueryUPDATE ("can not update the image of a banner", DB_QueryUPDATE ("can not update the image of a banner",
"UPDATE banners SET Img='%s' WHERE BanCod=%ld", "UPDATE ban_banners"
NewImg,Ban.BanCod); " SET Img='%s'"
" WHERE BanCod=%ld",
NewImg,
Ban.BanCod);
/***** Write message to show the change made *****/ /***** Write message to show the change made *****/
Ale_CreateAlert (Ale_SUCCESS,NULL, Ale_CreateAlert (Ale_SUCCESS,NULL,
@ -856,8 +882,11 @@ void Ban_ChangeBannerWWW (void)
{ {
/* Update the table changing old WWW by new WWW */ /* Update the table changing old WWW by new WWW */
DB_QueryUPDATE ("can not update the web of a banner", DB_QueryUPDATE ("can not update the web of a banner",
"UPDATE banners SET WWW='%s' WHERE BanCod=%ld", "UPDATE ban_banners"
NewWWW,Ban.BanCod); " SET WWW='%s'"
" WHERE BanCod=%ld",
NewWWW,
Ban.BanCod);
/***** Write message to show the change made *****/ /***** Write message to show the change made *****/
Ale_CreateAlert (Ale_SUCCESS,NULL, Ale_CreateAlert (Ale_SUCCESS,NULL,
@ -1056,11 +1085,14 @@ static void Ban_CreateBanner (const struct Ban_Banner *Ban)
{ {
/***** Create a new banner *****/ /***** Create a new banner *****/
DB_QueryINSERT ("can not create banner", DB_QueryINSERT ("can not create banner",
"INSERT INTO banners" "INSERT INTO ban_banners"
" (Hidden,ShortName,FullName,Img,WWW)" " (Hidden,ShortName,FullName,Img,WWW)"
" VALUES" " VALUES"
" ('N','%s','%s','%s','%s')", " ('N','%s','%s','%s','%s')",
Ban->ShrtName,Ban->FullName,Ban->Img,Ban->WWW); Ban->ShrtName,
Ban->FullName,
Ban->Img,
Ban->WWW);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -1080,11 +1112,18 @@ void Ban_WriteMenuWithBanners (void)
/***** Get random banner *****/ /***** Get random banner *****/
// The banner(s) will change once in a while // The banner(s) will change once in a while
NumRows = DB_QuerySELECT (&mysql_res,"can not get banners", NumRows = DB_QuerySELECT (&mysql_res,"can not get banners",
"SELECT BanCod,Hidden,ShortName,FullName,Img,WWW" "SELECT BanCod," // row[0]
" FROM banners" "Hidden," // row[1]
"ShortName," // row[2]
"FullName," // row[3]
"Img," // row[4]
"WWW" // row[5]
" FROM ban_banners"
" WHERE Hidden='N'" " WHERE Hidden='N'"
" ORDER BY RAND(%lu) LIMIT %u", " ORDER BY RAND(%lu)"
(unsigned long) (Gbl.StartExecutionTimeUTC / Cfg_TIME_TO_CHANGE_BANNER), " LIMIT %u",
(unsigned long) (Gbl.StartExecutionTimeUTC /
Cfg_TIME_TO_CHANGE_BANNER),
Cfg_NUMBER_OF_BANNERS); Cfg_NUMBER_OF_BANNERS);
Ban_GetListBanners (&Banners,&mysql_res,NumRows); Ban_GetListBanners (&Banners,&mysql_res,NumRows);

6
swad_changelog.h
View File

@ -600,12 +600,16 @@ TODO: Salvador Romero Cort
TODO: FIX BUG, URGENT! En las fechas como parámetro Dat_WriteParamsIniEndDates(), por ejemplo al cambiar el color de la gráfica de accesos por día y hora, no se respeta la zona horaria. TODO: FIX BUG, URGENT! En las fechas como parámetro Dat_WriteParamsIniEndDates(), por ejemplo al cambiar el color de la gráfica de accesos por día y hora, no se respeta la zona horaria.
*/ */
#define Log_PLATFORM_VERSION "SWAD 20.50.3 (2021-03-16)" #define Log_PLATFORM_VERSION "SWAD 20.50.4 (2021-03-17)"
#define CSS_FILE "swad20.45.css" #define CSS_FILE "swad20.45.css"
#define JS_FILE "swad20.6.2.js" #define JS_FILE "swad20.6.2.js"
/* /*
TODO: Rename CENTRE to CENTER in help wiki. TODO: Rename CENTRE to CENTER in help wiki.
Version 20.50.4: Mar 17, 2021 Banners database table renamed. (307280 lines)
1 change necessary in database:
RENAME TABLE banners TO ban_banners;
Version 20.50.3: Mar 16, 2021 Assignments database table renamed. (307241 lines) Version 20.50.3: Mar 16, 2021 Assignments database table renamed. (307241 lines)
1 change necessary in database: 1 change necessary in database:
RENAME TABLE assignments TO asg_assignments; RENAME TABLE assignments TO asg_assignments;

6
swad_database.c
View File

@ -333,9 +333,9 @@ mysql> DESCRIBE att_usr;
"UNIQUE INDEX(AttCod,UsrCod)," "UNIQUE INDEX(AttCod,UsrCod),"
"INDEX(UsrCod))"); "INDEX(UsrCod))");
/***** Table banners *****/ /***** Table ban_banners *****/
/* /*
mysql> DESCRIBE banners; mysql> DESCRIBE ban_banners;
+-----------+---------------+------+-----+---------+----------------+ +-----------+---------------+------+-----+---------+----------------+
| Field | Type | Null | Key | Default | Extra | | Field | Type | Null | Key | Default | Extra |
+-----------+---------------+------+-----+---------+----------------+ +-----------+---------------+------+-----+---------+----------------+
@ -348,7 +348,7 @@ mysql> DESCRIBE banners;
+-----------+---------------+------+-----+---------+----------------+ +-----------+---------------+------+-----+---------+----------------+
6 rows in set (0,00 sec) 6 rows in set (0,00 sec)
*/ */
DB_CreateTable ("CREATE TABLE IF NOT EXISTS banners (" DB_CreateTable ("CREATE TABLE IF NOT EXISTS ban_banners ("
"BanCod INT NOT NULL AUTO_INCREMENT," "BanCod INT NOT NULL AUTO_INCREMENT,"
"Hidden ENUM('N','Y') NOT NULL DEFAULT 'N'," "Hidden ENUM('N','Y') NOT NULL DEFAULT 'N',"
"ShortName VARCHAR(511) NOT NULL," // Ban_MAX_BYTES_SHRT_NAME "ShortName VARCHAR(511) NOT NULL," // Ban_MAX_BYTES_SHRT_NAME