From b7014a963c608720060548ef8714f4c364b38e1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Thu, 24 Dec 2015 19:30:45 +0100 Subject: [PATCH] Version 15.73 --- swad_action.c | 6 +++--- swad_changelog.h | 5 ++++- swad_photo.c | 2 +- swad_preference.c | 5 ++++- swad_privacy.c | 23 ++++++++++++++--------- swad_privacy.h | 4 ++-- swad_profile.c | 2 +- swad_text.c | 1 - 8 files changed, 29 insertions(+), 19 deletions(-) diff --git a/swad_action.c b/swad_action.c index ef19a8a89..02e056dec 100644 --- a/swad_action.c +++ b/swad_action.c @@ -2590,9 +2590,9 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActUpdMyPho */{ 694,-1,TabPrf,ActReqEdiRecCom ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,Pho_UpdateMyPhoto1 ,Pho_UpdateMyPhoto2 ,NULL}, /* ActRemMyPho */{ 428,-1,TabPrf,ActReqEdiRecCom ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,Pho_RemoveMyPhoto1 ,Pho_RemoveMyPhoto2 ,NULL}, - /* ActEdiPri */{1403,-1,TabPrf,ActReqEdiRecCom ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Pri_EditMyPrivacy ,NULL}, - /* ActChgPriPho */{ 774,-1,TabPrf,ActReqEdiRecCom ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Pho_ChangePhotoVisibility ,NULL}, - /* ActChgPriPrf */{1404,-1,TabPrf,ActReqEdiRecCom ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Prf_ChangeProfileVisibility ,NULL}, + /* ActEdiPri */{1403,-1,TabPrf,ActEdiPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Pri_EditMyPrivacy ,NULL}, + /* ActChgPriPho */{ 774,-1,TabPrf,ActEdiPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Pho_ChangePhotoVisibility ,NULL}, + /* ActChgPriPrf */{1404,-1,TabPrf,ActEdiPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Prf_ChangeProfileVisibility ,NULL}, /* ActReqEdiMyIns */{1165,-1,TabPrf,ActReqEdiRecCom ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Rec_ShowFormMyInsCtrDpt ,NULL}, /* ActChgCtyMyIns */{1166,-1,TabPrf,ActReqEdiRecCom ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Rec_ChgCountryOfMyInstitution ,NULL}, diff --git a/swad_changelog.h b/swad_changelog.h index 0ea1f34fe..41596c661 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -117,12 +117,15 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.72.7 (2015-12-24)" +#define Log_PLATFORM_VERSION "SWAD 15.73 (2015-12-24)" #define CSS_FILE "swad15.72.4.css" // 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.73: Dec 24, 2015 Fixed bug in privacy form. + Privacy is moved to preferences. + Default privacy is changed from "user" to "system". (187704 lines) Version 15.72.7: Dec 24, 2015 Remove message to teachers to verify indicators. (187695 lines) Version 15.72.6: Dec 24, 2015 Debug message removed. (187796 lines) Version 15.72.5: Dec 24, 2015 Fixed bugs while sending a message to a unique recipient. (187794 lines) diff --git a/swad_photo.c b/swad_photo.c index 9a92322a9..bcfadb6ed 100644 --- a/swad_photo.c +++ b/swad_photo.c @@ -1112,7 +1112,7 @@ void Pho_ChangePhotoVisibility (void) char Query[128]; /***** Get param with public/private photo *****/ - Gbl.Usrs.Me.UsrDat.PhotoVisibility = Pri_GetParamVisibility (); + Gbl.Usrs.Me.UsrDat.PhotoVisibility = Pri_GetParamVisibility ("VisPho"); /***** Store public/private photo in database *****/ sprintf (Query,"UPDATE usr_data SET PhotoVisibility='%s'" diff --git a/swad_preference.c b/swad_preference.c index 08d81e642..81a3b427e 100644 --- a/swad_preference.c +++ b/swad_preference.c @@ -108,9 +108,12 @@ void Pre_EditPrefs (void) "" ""); - /***** Automatic e-mail to notify of new events *****/ if (Gbl.Usrs.Me.Logged) { + /***** Form to set my preferences on privacy *****/ + Pri_EditMyPrivacy (); + + /***** Automatic e-mail to notify of new events *****/ Ntf_PutFormChangeNotifSentByEMail (); Str_GetMailBox (Gbl.Usrs.Me.UsrDat.Email,MailDomain,Usr_MAX_BYTES_USR_EMAIL); diff --git a/swad_privacy.c b/swad_privacy.c index fd26b3bc2..f7eba7994 100644 --- a/swad_privacy.c +++ b/swad_privacy.c @@ -60,7 +60,8 @@ const char *Pri_VisibilityDB[Pri_NUM_OPTIONS_PRIVACY] = /***************************** Private prototypes ****************************/ /*****************************************************************************/ -static void Pri_PutFormVisibility (const char *TxtLabel,Act_Action_t Action, +static void Pri_PutFormVisibility (const char *TxtLabel, + Act_Action_t Action,const char *ParamName, Pri_Visibility_t CurrentVisibilityInDB); /*****************************************************************************/ @@ -90,11 +91,13 @@ void Pri_EditMyPrivacy (void) Lay_StartRoundFrameTable (NULL,2,Txt_Privacy); /***** Edit photo visibility *****/ - Pri_PutFormVisibility (Txt_Photo,ActChgPriPho, + Pri_PutFormVisibility (Txt_Photo, + ActChgPriPho,"VisPho", Gbl.Usrs.Me.UsrDat.PhotoVisibility); /***** Edit public profile visibility *****/ - Pri_PutFormVisibility (Txt_Public_profile,ActChgPriPrf, + Pri_PutFormVisibility (Txt_Public_profile, + ActChgPriPrf,"VisPrf", Gbl.Usrs.Me.UsrDat.ProfileVisibility); /***** End table *****/ @@ -105,8 +108,9 @@ void Pri_EditMyPrivacy (void) /************************** Select photo visibility **************************/ /*****************************************************************************/ -void Pri_PutFormVisibility (const char *TxtLabel,Act_Action_t Action, - Pri_Visibility_t CurrentVisibilityInDB) +static void Pri_PutFormVisibility (const char *TxtLabel, + Act_Action_t Action,const char *ParamName, + Pri_Visibility_t CurrentVisibilityInDB) { extern const char *The_ClassForm[The_NUM_THEMES]; extern const char *Txt_PRIVACY_OPTIONS[Pri_NUM_OPTIONS_PRIVACY]; @@ -128,8 +132,8 @@ void Pri_PutFormVisibility (const char *TxtLabel,Act_Action_t Action, Visibility++) { fprintf (Gbl.F.Out,"
  • " - "" @@ -166,12 +170,12 @@ Pri_Visibility_t Pri_GetVisibilityFromStr (const char *Str) /**************** Get parameter with visibility from form ********************/ /*****************************************************************************/ -bool Pri_GetParamVisibility (void) +Pri_Visibility_t Pri_GetParamVisibility (const char *ParamName) { char UnsignedStr[10+1]; unsigned UnsignedNum; - Par_GetParToText ("Visibility",UnsignedStr,10); + Par_GetParToText (ParamName,UnsignedStr,10); if (UnsignedStr[0]) { if (sscanf (UnsignedStr,"%u",&UnsignedNum) != 1) @@ -180,6 +184,7 @@ bool Pri_GetParamVisibility (void) Lay_ShowErrorAndExit ("Visibility is missing."); return (Pri_Visibility_t) UnsignedNum; } + return Pri_VISIBILITY_DEFAULT; } diff --git a/swad_privacy.h b/swad_privacy.h index 10fedb109..824b68132 100644 --- a/swad_privacy.h +++ b/swad_privacy.h @@ -42,7 +42,7 @@ typedef enum Pri_VISIBILITY_WORLD = 3, // Public, visible by all the people, even unlogged visitors } Pri_Visibility_t; -#define Pri_VISIBILITY_DEFAULT Pri_VISIBILITY_USER +#define Pri_VISIBILITY_DEFAULT Pri_VISIBILITY_SYSTEM /*****************************************************************************/ /***************************** Public prototypes *****************************/ @@ -52,7 +52,7 @@ void Pri_PutLinkToChangeMyPrivacy (void); void Pri_EditMyPrivacy (void); Pri_Visibility_t Pri_GetVisibilityFromStr (const char *Str); -bool Pri_GetParamVisibility (void); +Pri_Visibility_t Pri_GetParamVisibility (const char *ParamName); bool Pri_ShowIsAllowed (Pri_Visibility_t Visibility,long OtherUsrCod); diff --git a/swad_profile.c b/swad_profile.c index e83ecad7f..a3832990e 100644 --- a/swad_profile.c +++ b/swad_profile.c @@ -254,7 +254,7 @@ void Prf_ChangeProfileVisibility (void) char Query[128]; /***** Get param with public/private photo *****/ - Gbl.Usrs.Me.UsrDat.ProfileVisibility = Pri_GetParamVisibility (); + Gbl.Usrs.Me.UsrDat.ProfileVisibility = Pri_GetParamVisibility ("VisPrf"); /***** Store public/private photo in database *****/ sprintf (Query,"UPDATE usr_data SET ProfileVisibility='%s'" diff --git a/swad_text.c b/swad_text.c index 0a4144bc2..bfe686ad5 100644 --- a/swad_text.c +++ b/swad_text.c @@ -27551,7 +27551,6 @@ const char *Txt_Privacy = "Privacidade"; #endif - const char *Txt_PRIVACY_OPTIONS[Pri_NUM_OPTIONS_PRIVACY] = { // Pri_VISIBILITY_USER #if L==1