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.120.2: Jun 07, 2023 Code refactoring related to cookies and hidden-visible.

This commit is contained in:
acanas 2023-06-07 00:51:41 +02:00
parent b5cb69121e
commit 6408f2f54b
8 changed files with 64 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -629,10 +629,11 @@ TODO: Emilce Barrera Mesa: Podr
TODO: Emilce Barrera Mesa: Mis estudiantes presentan muchas dificultades a la hora de poner la foto porque la plataforma es muy exigente respecto al fondo de la imagen.
*/
#define Log_PLATFORM_VERSION "SWAD 22.120.1 (2023-06-06)"
#define Log_PLATFORM_VERSION "SWAD 22.120.2 (2023-06-07)"
#define CSS_FILE "swad22.120.css"
#define JS_FILE "swad22.49.js"
/*
Version 22.120.2: Jun 07, 2023 Code refactoring related to cookies and hidden-visible. (337640 lines)
Version 22.120.1: Jun 06, 2023 Translation of messages about cookies. (337620 lines)
Version 22.120: Jun 06, 2023 Code refactoring related to hidden-visible. (337561 lines)
Version 22.119: Jun 06, 2023 Code refactoring related to hidden-visible. (337588 lines)

58
swad_cookie.c
View File

@ -79,19 +79,24 @@ void Coo_EditMyPrefsOnCookies (void)
Frm_BeginFormAnchor (ActChgCooPrf,Coo_COOKIES_ID);
/* Begin container */
if (Gbl.Usrs.Me.UsrDat.Prefs.AcceptCookies)
HTM_DIV_Begin ("class=\"DAT_STRONG_%s BG_HIGHLIGHT\"",
The_GetSuffix ());
else
HTM_DIV_Begin ("class=\"DAT_%s\"",
The_GetSuffix ());
switch (Gbl.Usrs.Me.UsrDat.Prefs.RefuseAcceptCookies)
{
case Coo_REFUSE:
HTM_DIV_Begin ("class=\"DAT_%s\"",
The_GetSuffix ());
break;
case Coo_ACCEPT:
HTM_DIV_Begin ("class=\"DAT_STRONG_%s BG_HIGHLIGHT\"",
The_GetSuffix ());
break;
}
/* Check box */
HTM_LABEL_Begin (NULL);
HTM_INPUT_CHECKBOX ("cookies",HTM_SUBMIT_ON_CHANGE,
"value=\"Y\"%s",
Gbl.Usrs.Me.UsrDat.Prefs.AcceptCookies ? " checked=\"checked\"" :
"");
Gbl.Usrs.Me.UsrDat.Prefs.RefuseAcceptCookies == Coo_ACCEPT ? " checked=\"checked\"" :
"");
HTM_Txt (Txt_Accept_third_party_cookies_to_view_multimedia_content_from_other_websites);
HTM_LABEL_End ();
@ -125,7 +130,8 @@ static void Coo_PutIconsCookies (__attribute__((unused)) void *Args)
void Coo_ChangeMyPrefsCookies (void)
{
/***** Get param with preference about third party cookies *****/
Gbl.Usrs.Me.UsrDat.Prefs.AcceptCookies = Par_GetParBool ("cookies");
Gbl.Usrs.Me.UsrDat.Prefs.RefuseAcceptCookies = Par_GetParBool ("cookies") ? Coo_ACCEPT :
Coo_REFUSE;
/***** Store preference in database *****/
if (Gbl.Usrs.Me.Logged)
@ -154,16 +160,16 @@ void Coo_GetAndShowNumUsrsPerCookies (void)
const char *Icon;
Ico_Color_t Color;
const char **Title;
} Accepted[2] =
} Accepted[Coo_NUM_REFUSE_ACCEPT] =
{
[false] =
[Coo_REFUSE] =
{
.InDB = 'N',
.Icon = "times.svg",
.Color = Ico_RED,
.Title = &Txt_Do_not_accept_third_party_cookies
},
[true ] =
[Coo_ACCEPT] =
{
.InDB = 'Y',
.Icon = "check.svg",
@ -171,7 +177,7 @@ void Coo_GetAndShowNumUsrsPerCookies (void)
.Title = &Txt_Accept_third_party_cookies
}
};
unsigned i;
Coo_RefuseAccept_t RefAcc;
char *SubQuery;
unsigned NumUsrs[Mnu_NUM_MENUS];
unsigned NumUsrsTotal = 0;
@ -189,39 +195,39 @@ void Coo_GetAndShowNumUsrsPerCookies (void)
HTM_TR_End ();
/***** For each option... *****/
for (i = 0;
i < 2;
i++)
for (RefAcc = (Coo_RefuseAccept_t) 0;
RefAcc < (Coo_RefuseAccept_t) (Coo_NUM_REFUSE_ACCEPT - 1);
RefAcc++)
{
/* Get number of users who have chosen this menu from database */
if (asprintf (&SubQuery,"usr_data.ThirdPartyCookies='%c'",
Accepted[i].InDB) < 0)
Accepted[RefAcc].InDB) < 0)
Err_NotEnoughMemoryExit ();
NumUsrs[i] = Usr_DB_GetNumUsrsWhoChoseAnOption (SubQuery);
NumUsrs[RefAcc] = Usr_DB_GetNumUsrsWhoChoseAnOption (SubQuery);
free (SubQuery);
/* Update total number of users */
NumUsrsTotal += NumUsrs[i];
NumUsrsTotal += NumUsrs[RefAcc];
}
/***** Write number of users who have chosen each option *****/
for (i = 0;
i < 2;
i++)
for (RefAcc = (Coo_RefuseAccept_t) 0;
RefAcc < (Coo_RefuseAccept_t) (Coo_NUM_REFUSE_ACCEPT - 1);
RefAcc++)
{
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"CM\"");
Ico_PutIcon (Accepted[i].Icon,Accepted[i].Color,
*Accepted[i].Title,"ICOx16");
Ico_PutIcon (Accepted[RefAcc].Icon,Accepted[RefAcc].Color,
*Accepted[RefAcc].Title,"ICOx16");
HTM_TD_End ();
HTM_TD_Begin ("class=\"RM DAT_%s\"",The_GetSuffix ());
HTM_Unsigned (NumUsrs[i]);
HTM_Unsigned (NumUsrs[RefAcc]);
HTM_TD_End ();
HTM_TD_Begin ("class=\"RM DAT_%s\"",The_GetSuffix ());
HTM_Percentage (NumUsrsTotal ? (double) NumUsrs[i] * 100.0 /
HTM_Percentage (NumUsrsTotal ? (double) NumUsrs[RefAcc] * 100.0 /
(double) NumUsrsTotal :
0.0);
HTM_TD_End ();

8
swad_cookie.h
View File

@ -29,6 +29,14 @@
#define Coo_COOKIES_ID "cookies"
#define Coo_NUM_REFUSE_ACCEPT 2
typedef enum
{
Coo_REFUSE,
Coo_ACCEPT,
} Coo_RefuseAccept_t;
/*****************************************************************************/
/***************************** Public prototypes *****************************/
/*****************************************************************************/

4
swad_cookie_database.c
View File

@ -48,7 +48,7 @@ void Coo_DB_UpdateMyPrefsCookies (void)
"UPDATE usr_data"
" SET ThirdPartyCookies='%c'"
" WHERE UsrCod=%ld",
Gbl.Usrs.Me.UsrDat.Prefs.AcceptCookies ? 'Y' :
'N',
Gbl.Usrs.Me.UsrDat.Prefs.RefuseAcceptCookies == Coo_ACCEPT ? 'Y' :
'N',
Gbl.Usrs.Me.UsrDat.UsrCod);
}

18
swad_test_visibility.c
View File

@ -44,7 +44,7 @@ void TstVis_ShowVisibilityIcons (unsigned SelectedVisibility,
HidVis_HiddenOrVisible_t HiddenOrVisible)
{
extern const char *Txt_TST_STR_VISIBILITY[TstVis_NUM_ITEMS_VISIBILITY];
extern const char *Txt_TST_HIDDEN_VISIBLE[2];
extern const char *Txt_TST_HIDDEN_VISIBLE[HidVis_NUM_HIDDEN_VISIBLE];
static const char *Icons[TstVis_NUM_ITEMS_VISIBILITY] =
{
[TstVis_VISIBLE_QST_ANS_TXT ] = "file-alt.svg",
@ -53,23 +53,27 @@ void TstVis_ShowVisibilityIcons (unsigned SelectedVisibility,
[TstVis_VISIBLE_EACH_QST_SCORE] = "tasks.svg",
[TstVis_VISIBLE_TOTAL_SCORE ] = "check-circle-regular.svg",
};
static Ico_Color_t Color[HidVis_NUM_HIDDEN_VISIBLE] =
{
[HidVis_HIDDEN ] = Ico_RED,
[HidVis_VISIBLE] = Ico_GREEN,
};
static void (*Ico_PutIcon[HidVis_NUM_HIDDEN_VISIBLE]) (const char *Icon,Ico_Color_t Color,const char *Title);
TstVis_Visibility_t Visibility;
bool ItemVisible;
HidVis_HiddenOrVisible_t ItemHiddenOrVisible;
char *Title;
for (Visibility = (TstVis_Visibility_t) 0;
Visibility <= (TstVis_Visibility_t) (TstVis_NUM_ITEMS_VISIBILITY - 1);
Visibility++)
{
ItemVisible = (SelectedVisibility & (1 << Visibility)) != 0;
ItemHiddenOrVisible = ((SelectedVisibility & (1 << Visibility)) != 0) ? HidVis_VISIBLE :
HidVis_HIDDEN;
if (asprintf (&Title,"%s: %s",
Txt_TST_STR_VISIBILITY[Visibility],
Txt_TST_HIDDEN_VISIBLE[ItemVisible]) < 0)
Txt_TST_HIDDEN_VISIBLE[ItemHiddenOrVisible]) < 0)
Err_NotEnoughMemoryExit ();
Ico_PutIcon[HiddenOrVisible] (Icons[Visibility],ItemVisible ? Ico_GREEN :
Ico_RED ,Title);
Ico_PutIcon[HiddenOrVisible] (Icons[Visibility],Color[ItemHiddenOrVisible],Title);
free (Title);
}
}

6
swad_text.c
View File

@ -54466,9 +54466,9 @@ const char *Txt_TST_Answer_given_by_the_user =
"Answer given by the user"; // Çeviri lazim!
#endif
const char *Txt_TST_HIDDEN_VISIBLE[2] =
const char *Txt_TST_HIDDEN_VISIBLE[HidVis_NUM_HIDDEN_VISIBLE] =
{
[false] =
[HidVis_HIDDEN] =
#if L==1 // ca
"ocult"
#elif L==2 // de
@ -54491,7 +54491,7 @@ const char *Txt_TST_HIDDEN_VISIBLE[2] =
"hidden" // Çeviri lazim!
#endif
,
[true] =
[HidVis_VISIBLE] =
#if L==1 // ca
"visible"
#elif L==2 // de

7
swad_user.c
View File

@ -349,8 +349,8 @@ void Usr_ResetUsrDataExceptUsrCodAndIDs (struct Usr_Data *UsrDat)
UsrDat->Prefs.Menu = Mnu_MENU_DEFAULT;
UsrDat->Prefs.SideCols = Cfg_DEFAULT_COLUMNS;
UsrDat->Prefs.PhotoShape = PhoSha_SHAPE_DEFAULT;
UsrDat->Prefs.AcceptCookies = false; // By default, don't accept third party cookies
UsrDat->NtfEvents.SendEmail = 0; // By default, don't notify anything
UsrDat->Prefs.RefuseAcceptCookies = Coo_REFUSE; // By default, don't accept third party cookies
UsrDat->NtfEvents.SendEmail = 0; // By default, don't notify anything
}
/*****************************************************************************/
@ -562,7 +562,8 @@ void Usr_GetUsrDataFromUsrCod (struct Usr_Data *UsrDat,
UsrDat->Prefs.Menu = Mnu_GetMenuFromStr (row[28]);
UsrDat->Prefs.SideCols = Set_GetSideColsFromStr (row[29]);
UsrDat->Prefs.PhotoShape = PhoSha_GetShapeFromStr (row[30]);
UsrDat->Prefs.AcceptCookies = (row[31][0] == 'Y');
UsrDat->Prefs.RefuseAcceptCookies = (row[31][0] == 'Y') ? Coo_ACCEPT :
Coo_REFUSE;
}
}
else

3
swad_user.h
View File

@ -31,6 +31,7 @@
#include "swad_action.h"
#include "swad_constant.h"
#include "swad_cookie.h"
#include "swad_country.h"
#include "swad_cryptography.h"
#include "swad_date.h"
@ -217,7 +218,7 @@ struct Usr_Data
Mnu_Menu_t Menu;
unsigned SideCols;
PhoSha_Shape_t PhotoShape;
bool AcceptCookies; // User has accepted third party cookies
Coo_RefuseAccept_t RefuseAcceptCookies; // User has accepted third party cookies
} Prefs;
};