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 15.38.2

This commit is contained in:
Antonio Cañas Vargas 2015-11-15 02:24:48 +01:00
parent 7758759ed9
commit f8fa021084
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -112,11 +112,12 @@
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.38.1 (2015/11/14)" #define Log_PLATFORM_VERSION "SWAD 15.38.2 (2015/11/15)"
// Number of lines (includes comments but not blank lines) has been got with the following command: // 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 // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1
/* /*
Version 15.38.2: Nov 15, 2015 Fixed bug in user's privacy preferences. (187071 lines)
Version 15.38.1: Nov 14, 2015 Changes in permission to query the whole range of dates in stats, suggested by Francisco Ocaña Lara. (187073 lines) Version 15.38.1: Nov 14, 2015 Changes in permission to query the whole range of dates in stats, suggested by Francisco Ocaña Lara. (187073 lines)
Version 15.38: Nov 13, 2015 New option for students: list of my attendance. (187063 lines) Version 15.38: Nov 13, 2015 New option for students: list of my attendance. (187063 lines)
2 changes necessary in database: 2 changes necessary in database:

23
swad_privacy.c
View File

@ -189,28 +189,25 @@ bool Pri_GetParamVisibility (void)
bool Pri_ShowIsAllowed (Pri_Visibility_t Visibility,long OtherUsrCod) bool Pri_ShowIsAllowed (Pri_Visibility_t Visibility,long OtherUsrCod)
{ {
bool ICanSee = false; /***** System admins always can see others' profiles *****/
if (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM)
return true;
/***** Check if I can see the other's photo *****/ /***** Check if I can see the other's photo *****/
switch (Visibility) switch (Visibility)
{ {
case Pri_VISIBILITY_USER: // Only visible by me and my teachers if I am a student or me and my students if I am a teacher case Pri_VISIBILITY_USER: // Only visible by me and my teachers if I am a student or me and my students if I am a teacher
if (Gbl.Usrs.Me.UsrDat.UsrCod == OtherUsrCod || // It's me, I always can see my things if (Gbl.Usrs.Me.UsrDat.UsrCod == OtherUsrCod) // It's me, I always can see my things
Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM) // A system admin always can see any user's things return true;
ICanSee = true;
else else
ICanSee = Usr_CheckIfUsrSharesAnyOfMyCrsWithDifferentRole (OtherUsrCod); // Both users share the same course but whit different role return Usr_CheckIfUsrSharesAnyOfMyCrsWithDifferentRole (OtherUsrCod); // Both users share the same course but whit different role
break;
case Pri_VISIBILITY_COURSE: // Visible by users sharing courses with me case Pri_VISIBILITY_COURSE: // Visible by users sharing courses with me
ICanSee = Usr_CheckIfUsrSharesAnyOfMyCrs (OtherUsrCod); // Both users share the same course return Usr_CheckIfUsrSharesAnyOfMyCrs (OtherUsrCod); // Both users share the same course
break;
case Pri_VISIBILITY_SYSTEM: // Visible by any user logged in platform case Pri_VISIBILITY_SYSTEM: // Visible by any user logged in platform
ICanSee = Gbl.Usrs.Me.Logged; return Gbl.Usrs.Me.Logged;
break;
case Pri_VISIBILITY_WORLD: // Public, visible by everyone, even unlogged visitors case Pri_VISIBILITY_WORLD: // Public, visible by everyone, even unlogged visitors
ICanSee = true; return true;
break;
} }
return ICanSee; return false; // Never reached. To avoid warning
} }