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

This commit is contained in:
Antonio Cañas Vargas 2016-01-04 16:30:50 +01:00
parent b6c9bc0268
commit 93cc7375cd
2 changed files with 46 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
swad_changelog.h
View File

@ -111,19 +111,19 @@
// TODO: Reply to all
// TODO: Hour in exam announcement should start at six a.m.
// TODO: Forums For_FORUM_GLOBAL_USRS and For_FORUM_SWAD_USRS should be available for guests for coherence with social timeline?
// TODO: Actividad pública: (*) Visible por cualquier usuario identificado
/*****************************************************************************/
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.97.1 (2016-01-04)"
#define Log_PLATFORM_VERSION "SWAD 15.97.2 (2016-01-04)"
#define CSS_FILE "swad15.97.css"
#define JS_FILE "swad15.77.7.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 15.97.2: Jan 04, 2016 New option in user's privacy. (190743 lines)
Version 15.97.1: Jan 04, 2016 User's timeline below user's profile visible only by logged users. (190719 lines)
Version 15.97: Jan 04, 2016 Show list of some users who has shared a social note. (190718 lines)
3 changes necessary in database:

63
swad_privacy.c
View File

@ -62,7 +62,8 @@ const char *Pri_VisibilityDB[Pri_NUM_OPTIONS_PRIVACY] =
static void Pri_PutFormVisibility (const char *TxtLabel,
Act_Action_t Action,const char *ParamName,
Pri_Visibility_t CurrentVisibilityInDB);
Pri_Visibility_t CurrentVisibilityInDB,
unsigned MaskAllowedVisibility);
/*****************************************************************************/
/*************** Put a link to the action to edit my privacy *****************/
@ -86,6 +87,7 @@ void Pri_EditMyPrivacy (void)
extern const char *Txt_Privacy;
extern const char *Txt_Photo;
extern const char *Txt_Public_profile;
extern const char *Txt_Public_activity;
/***** Start table *****/
Lay_StartRoundFrameTable (NULL,2,Txt_Privacy);
@ -93,12 +95,26 @@ void Pri_EditMyPrivacy (void)
/***** Edit photo visibility *****/
Pri_PutFormVisibility (Txt_Photo,
ActChgPriPho,"VisPho",
Gbl.Usrs.Me.UsrDat.PhotoVisibility);
Gbl.Usrs.Me.UsrDat.PhotoVisibility,
(1 << Pri_VISIBILITY_USER) |
(1 << Pri_VISIBILITY_COURSE) |
(1 << Pri_VISIBILITY_SYSTEM) |
(1 << Pri_VISIBILITY_WORLD));
/***** Edit public profile visibility *****/
Pri_PutFormVisibility (Txt_Public_profile,
ActChgPriPrf,"VisPrf",
Gbl.Usrs.Me.UsrDat.ProfileVisibility);
Gbl.Usrs.Me.UsrDat.ProfileVisibility,
(1 << Pri_VISIBILITY_USER) |
(1 << Pri_VISIBILITY_COURSE) |
(1 << Pri_VISIBILITY_SYSTEM) |
(1 << Pri_VISIBILITY_WORLD));
/***** Edit public activity (timeline) visibility *****/
Pri_PutFormVisibility (Txt_Public_activity,
ActUnk,"VisTml",
Pri_VISIBILITY_SYSTEM,
(1 << Pri_VISIBILITY_SYSTEM));
/***** End table *****/
Lay_EndRoundFrameTable ();
@ -110,7 +126,8 @@ void Pri_EditMyPrivacy (void)
static void Pri_PutFormVisibility (const char *TxtLabel,
Act_Action_t Action,const char *ParamName,
Pri_Visibility_t CurrentVisibilityInDB)
Pri_Visibility_t CurrentVisibilityInDB,
unsigned MaskAllowedVisibility)
{
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_PRIVACY_OPTIONS[Pri_NUM_OPTIONS_PRIVACY];
@ -125,28 +142,36 @@ static void Pri_PutFormVisibility (const char *TxtLabel,
The_ClassForm[Gbl.Prefs.Theme],TxtLabel);
/***** Form with list of options *****/
Act_FormStart (Action);
if (Action != ActUnk)
Act_FormStart (Action);
fprintf (Gbl.F.Out,"<ul class=\"LIST_LEFT\">");
for (Visibility = (Pri_Visibility_t) 0;
Visibility < Pri_NUM_OPTIONS_PRIVACY;
Visibility++)
{
fprintf (Gbl.F.Out,"<li class=\"%s\">"
"<input type=\"radio\" name=\"%s\" value=\"%u\"",
(Visibility == CurrentVisibilityInDB) ? "DAT_N LIGHT_BLUE" :
"DAT",
ParamName,(unsigned) Visibility);
if (Visibility == CurrentVisibilityInDB)
fprintf (Gbl.F.Out," checked=\"checked\"");
fprintf (Gbl.F.Out," onclick=\"document.getElementById('%s').submit();\" />"
"%s"
"</li>",
Gbl.FormId,Txt_PRIVACY_OPTIONS[Visibility]);
}
if (MaskAllowedVisibility & 1 << Visibility)
{
fprintf (Gbl.F.Out,"<li class=\"%s\">"
"<input type=\"radio\" name=\"%s\" value=\"%u\"",
(Visibility == CurrentVisibilityInDB) ? "DAT_N LIGHT_BLUE" :
"DAT",
ParamName,(unsigned) Visibility);
if (Visibility == CurrentVisibilityInDB)
fprintf (Gbl.F.Out," checked=\"checked\"");
if (Action == ActUnk)
fprintf (Gbl.F.Out," disabled=\"disabled\"");
else
fprintf (Gbl.F.Out," onclick=\"document.getElementById('%s').submit();\"",
Gbl.FormId);
fprintf (Gbl.F.Out," />"
"%s"
"</li>",
Txt_PRIVACY_OPTIONS[Visibility]);
}
/***** End of list and form *****/
fprintf (Gbl.F.Out,"</ul>");
Act_FormEnd ();
if (Action != ActUnk)
Act_FormEnd ();
fprintf (Gbl.F.Out,"</td>"
"</tr>");
}