");
diff --git a/swad_notification.c b/swad_notification.c
index 160205df..8733584b 100644
--- a/swad_notification.c
+++ b/swad_notification.c
@@ -754,7 +754,7 @@ static bool Ntf_StartFormGoToAction (Ntf_NotifyEvent_t NotifyEvent,
if (UsrDat->EncryptedUsrCod[0]) // User's code found ==>
// go to user's public profile
{
- Act_FormStart (ActSeePubPrf);
+ Act_FormStart (ActSeeOthPubPrf);
/* Put param to go to follower's profile */
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
}
diff --git a/swad_parameter.c b/swad_parameter.c
index 587fc4f2..e10061ec 100644
--- a/swad_parameter.c
+++ b/swad_parameter.c
@@ -692,7 +692,7 @@ void Par_GetMainParameters (void)
// and to refresh old publishings in user's timeline
// If user does not exist ==> UsrCod = -1
Gbl.Usrs.Other.UsrDat.UsrCod = Nck_GetUsrCodFromNickname (Gbl.Usrs.Other.UsrDat.Nickname);
- Gbl.Action.Act = ActSeePubPrf; // Set default action if no other is specified
+ Gbl.Action.Act = ActSeeOthPubPrf; // Set default action if no other is specified
}
}
else if (Par_GetParToText ("agd",Nickname,Nck_MAX_BYTES_NICKNAME_FROM_FORM))
diff --git a/swad_photo.c b/swad_photo.c
index f56e6779..f36b9113 100644
--- a/swad_photo.c
+++ b/swad_photo.c
@@ -1121,20 +1121,34 @@ void Pho_ShowUsrPhoto (const struct UsrData *UsrDat,const char *PhotoURL,
Zoom == Pho_ZOOM && // Make zoom
Act_Actions[Gbl.Action.Act].BrowserWindow == Act_THIS_WINDOW; // Only in main window
char IdCaption[Act_MAX_LENGTH_ID];
-
+ bool ItsMe = (Gbl.Usrs.Me.Logged &&
+ UsrDat->UsrCod == Gbl.Usrs.Me.UsrDat.UsrCod);
/***** Start form to go to public profile *****/
if (PutLinkToPublicProfile)
{
if (FormUnique)
- Act_FormStartUnique (ActSeePubPrf);
- else
- Act_FormStart (ActSeePubPrf);
- Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
- if (FormUnique)
- Act_LinkFormSubmitUnique (NULL,NULL);
+ {
+ if (ItsMe)
+ Act_FormStartUnique (ActSeeMyPubPrf);
+ else
+ {
+ Act_FormStartUnique (ActSeeOthPubPrf);
+ Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
+ }
+ Act_LinkFormSubmitUnique (NULL,NULL);
+ }
else
+ {
+ if (ItsMe)
+ Act_FormStart (ActSeeMyPubPrf);
+ else
+ {
+ Act_FormStart (ActSeeOthPubPrf);
+ Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
+ }
Act_LinkFormSubmit (NULL,NULL,NULL);
+ }
}
/***** Hidden div to pass user's name to Javascript *****/
diff --git a/swad_profile.c b/swad_profile.c
index 2923b88a..cf10a885 100644
--- a/swad_profile.c
+++ b/swad_profile.c
@@ -124,19 +124,31 @@ char *Prf_GetURLPublicProfile (char *URL,const char *NicknameWithoutArroba)
}
/*****************************************************************************/
-/******************* Put link to request a user's profile ********************/
+/******************** Put link to view my public profile *********************/
/*****************************************************************************/
-void Prf_PutLinkRequestUserProfile (void)
+void Prf_PutLinkMyPublicProfile (void)
{
- extern const char *Txt_View_public_profile;
+ extern const char *Txt_My_public_profile;
- fprintf (Gbl.F.Out,"");
}
/*****************************************************************************/
@@ -145,9 +157,14 @@ void Prf_PutLinkRequestUserProfile (void)
void Prf_RequestUserProfile (void)
{
- /***** Put link to show users to follow *****/
if (Gbl.Usrs.Me.Logged)
+ {
+ /***** Put link to show my public profile and users to follow *****/
+ fprintf (Gbl.F.Out,"");
+ }
/* By default, the nickname is filled with my nickname
If no user logged ==> the nickname is empty */
@@ -161,16 +178,16 @@ void Prf_RequestUserProfile (void)
static void Prf_RequestUserProfileWithDefaultNickname (const char *DefaultNickname)
{
extern const char *Hlp_SOCIAL_Profiles_view_public_profile;
- extern const char *Txt_View_public_profile;
+ extern const char *Txt_Another_user_s_profile;
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_Nickname;
extern const char *Txt_Continue;
/***** Start form *****/
- Act_FormStart (ActSeePubPrf);
+ Act_FormStart (ActSeeOthPubPrf);
/***** Start frame *****/
- Lay_StartRoundFrame (NULL,Txt_View_public_profile,NULL,Hlp_SOCIAL_Profiles_view_public_profile);
+ Lay_StartRoundFrame (NULL,Txt_Another_user_s_profile,NULL,Hlp_SOCIAL_Profiles_view_public_profile);
/***** Form to request user's @nickname *****/
fprintf (Gbl.F.Out,"
"
@@ -190,6 +207,19 @@ static void Prf_RequestUserProfileWithDefaultNickname (const char *DefaultNickna
Act_FormEnd ();
}
+/*****************************************************************************/
+/************************** Show my public profile ***************************/
+/*****************************************************************************/
+
+void Prf_ShowMyProfile (void)
+ {
+ extern const char *Txt_User_not_found_or_you_do_not_have_permission_;
+
+ if (!Prf_ShowUserProfile (&Gbl.Usrs.Me.UsrDat))
+ /* Show error message */
+ Lay_ShowAlert (Lay_WARNING,Txt_User_not_found_or_you_do_not_have_permission_);
+ }
+
/*****************************************************************************/
/******************** Get user and show a user's profile *********************/
/*****************************************************************************/
@@ -254,18 +284,21 @@ bool Prf_ShowUserProfile (struct UsrData *UsrDat)
/***** Contextual links *****/
if (Gbl.Usrs.Me.Logged)
{
+ fprintf (Gbl.F.Out,"");
}
/***** Check if I can see the public profile *****/
@@ -1487,10 +1520,12 @@ void Prf_GetAndShowRankingClicksPerDay (void)
void Prf_ShowUsrInRanking (struct UsrData *UsrDat,unsigned Rank)
{
- extern const char *Txt_View_public_profile;
+ extern const char *Txt_Another_user_s_profile;
bool ShowPhoto;
char PhotoURL[PATH_MAX + 1];
bool Visible = Pri_ShowingIsAllowed (UsrDat->ProfileVisibility,UsrDat);
+ bool ItsMe = (Gbl.Usrs.Me.Logged &&
+ UsrDat->UsrCod == Gbl.Usrs.Me.UsrDat.UsrCod);
fprintf (Gbl.F.Out,""
@@ -1519,9 +1554,14 @@ void Prf_ShowUsrInRanking (struct UsrData *UsrDat,unsigned Rank)
/***** Put form to go to public profile *****/
if (Visible)
{
- Act_FormStart (ActSeePubPrf);
- Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
- Act_LinkFormSubmit (Txt_View_public_profile,"DAT_SMALL",NULL);
+ if (ItsMe)
+ Act_FormStart (ActSeeMyPubPrf);
+ else
+ {
+ Act_FormStart (ActSeeOthPubPrf);
+ Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
+ }
+ Act_LinkFormSubmit (Txt_Another_user_s_profile,"DAT_SMALL",NULL);
Usr_RestrictLengthAndWriteName (UsrDat,8);
fprintf (Gbl.F.Out,"");
Act_FormEnd ();
diff --git a/swad_profile.h b/swad_profile.h
index db5c588c..45582cec 100644
--- a/swad_profile.h
+++ b/swad_profile.h
@@ -52,8 +52,10 @@ struct UsrFigures
void Prf_SeeSocialProfiles (void);
char *Prf_GetURLPublicProfile (char *URL,const char *NicknameWithoutArroba);
-void Prf_PutLinkRequestUserProfile (void);
+void Prf_PutLinkMyPublicProfile (void);
+void Prf_PutLinkRequestAnotherUserProfile (void);
void Prf_RequestUserProfile (void);
+void Prf_ShowMyProfile (void);
void Prf_GetUsrDatAndShowUserProfile (void);
bool Prf_ShowUserProfile (struct UsrData *UsrDat);
diff --git a/swad_record.c b/swad_record.c
index 14c11b54..2e8852cc 100644
--- a/swad_record.c
+++ b/swad_record.c
@@ -2333,7 +2333,8 @@ static void Rec_PutIconsCommands (void)
{
extern struct Act_Actions Act_Actions[Act_NUM_ACTIONS];
extern const char *Txt_Edit_my_personal_data;
- extern const char *Txt_View_public_profile;
+ extern const char *Txt_My_public_profile;
+ extern const char *Txt_Another_user_s_profile;
extern const char *Txt_View_record_for_this_course;
extern const char *Txt_View_record_and_office_hours;
extern const char *Txt_Show_agenda;
@@ -2355,24 +2356,29 @@ static void Rec_PutIconsCommands (void)
Gbl.Usrs.Me.Logged) // Only if I am logged
{
ICanViewUsrProfile = Pri_ShowingIsAllowed (Gbl.Record.UsrDat->ProfileVisibility,
- Gbl.Record.UsrDat);
+ Gbl.Record.UsrDat);
/***** Start container *****/
fprintf (Gbl.F.Out,"");
- /***** Button to edit my record card *****/
if (ItsMe)
+ {
+ /***** Buttons to edit my record card and to view my profile *****/
Lay_PutContextualLink (ActReqEdiRecCom,NULL,
"edit64x64.png",
Txt_Edit_my_personal_data,NULL,
NULL);
-
- /***** Button to view user's public profile *****/
- if (ICanViewUsrProfile)
- Lay_PutContextualLink (ActSeePubPrf,
+ Lay_PutContextualLink (ActSeeMyPubPrf,NULL,
+ "usr64x64.gif",
+ Txt_My_public_profile,NULL,
+ NULL);
+ }
+ else if (ICanViewUsrProfile)
+ /***** Button to view another user's profile *****/
+ Lay_PutContextualLink (ActSeeOthPubPrf,
Rec_PutParamUsrCodEncrypted,
"usr64x64.gif",
- Txt_View_public_profile,NULL,
+ Txt_Another_user_s_profile,NULL,
NULL);
/***** Button to view user's record card *****/
@@ -2616,8 +2622,10 @@ static void Rec_ShowFullName (struct UsrData *UsrDat)
static void Rec_ShowNickname (struct UsrData *UsrDat,bool PutFormLinks)
{
- extern const char *Txt_View_public_profile;
+ extern const char *Txt_My_public_profile;
+ extern const char *Txt_Another_user_s_profile;
char NicknameWithArroba[Nck_MAX_BYTES_NICKNAME_FROM_FORM + 1];
+ bool ItsMe;
fprintf (Gbl.F.Out,"
"
""
@@ -2627,9 +2635,19 @@ static void Rec_ShowNickname (struct UsrData *UsrDat,bool PutFormLinks)
if (PutFormLinks)
{
/* Put form to go to public profile */
- Act_FormStart (ActSeePubPrf);
- Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
- Act_LinkFormSubmit (Txt_View_public_profile,"REC_NICK",NULL);
+ ItsMe = (Gbl.Usrs.Me.Logged &&
+ UsrDat->UsrCod == Gbl.Usrs.Me.UsrDat.UsrCod);
+ if (ItsMe)
+ {
+ Act_FormStart (ActSeeMyPubPrf);
+ Act_LinkFormSubmit (Txt_My_public_profile,"REC_NICK",NULL);
+ }
+ else
+ {
+ Act_FormStart (ActSeeOthPubPrf);
+ Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
+ Act_LinkFormSubmit (Txt_Another_user_s_profile,"REC_NICK",NULL);
+ }
}
fprintf (Gbl.F.Out,"@%s",UsrDat->Nickname);
if (PutFormLinks)
diff --git a/swad_social.c b/swad_social.c
index 3f11320b..74faee30 100644
--- a/swad_social.c
+++ b/swad_social.c
@@ -1368,25 +1368,44 @@ static void Soc_WriteSocialNote (const struct SocialNote *SocNot,
static void Soc_WriteTopMessage (Soc_TopMessage_t TopMessage,long UsrCod)
{
- extern const char *Txt_View_public_profile;
+ extern const char *Txt_My_public_profile;
+ extern const char *Txt_Another_user_s_profile;
extern const char *Txt_SOCIAL_NOTE_TOP_MESSAGES[Soc_NUM_TOP_MESSAGES];
struct UsrData UsrDat;
+ bool ItsMe = (Gbl.Usrs.Me.Logged &&
+ UsrCod == Gbl.Usrs.Me.UsrDat.UsrCod);
+ bool UsrOK;
if (TopMessage != Soc_TOP_MESSAGE_NONE)
{
- /***** Initialize structure with user's data *****/
- Usr_UsrDataConstructor (&UsrDat);
+ if (ItsMe)
+ UsrOK = true;
+ else
+ {
+ /***** Initialize structure with user's data *****/
+ Usr_UsrDataConstructor (&UsrDat);
- /***** Get user's data *****/
- UsrDat.UsrCod = UsrCod;
- if (Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat)) // Really we only need EncryptedUsrCod and FullName
+ /***** Get user's data *****/
+ UsrDat.UsrCod = UsrCod;
+ UsrOK = Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat); // Really we only need EncryptedUsrCod and FullName
+ }
+
+ if (UsrOK)
{
fprintf (Gbl.F.Out,"");
/***** Show user's name inside form to go to user's public profile *****/
- Act_FormStartUnique (ActSeePubPrf);
- Usr_PutParamUsrCodEncrypted (UsrDat.EncryptedUsrCod);
- Act_LinkFormSubmitUnique (Txt_View_public_profile,"SOCIAL_TOP_PUBLISHER");
+ if (ItsMe)
+ {
+ Act_FormStartUnique (ActSeeMyPubPrf);
+ Act_LinkFormSubmitUnique (Txt_My_public_profile,"SOCIAL_TOP_PUBLISHER");
+ }
+ else
+ {
+ Act_FormStartUnique (ActSeeOthPubPrf);
+ Usr_PutParamUsrCodEncrypted (UsrDat.EncryptedUsrCod);
+ Act_LinkFormSubmitUnique (Txt_Another_user_s_profile,"SOCIAL_TOP_PUBLISHER");
+ }
Str_LimitLengthHTMLStr (UsrDat.FullName,40);
fprintf (Gbl.F.Out,"%s",UsrDat.FullName);
Act_FormEnd ();
@@ -1396,8 +1415,9 @@ static void Soc_WriteTopMessage (Soc_TopMessage_t TopMessage,long UsrCod)
Txt_SOCIAL_NOTE_TOP_MESSAGES[TopMessage]);
}
- /***** Free memory used for user's data *****/
- Usr_UsrDataDestructor (&UsrDat);
+ if (!ItsMe)
+ /***** Free memory used for user's data *****/
+ Usr_UsrDataDestructor (&UsrDat);
}
}
@@ -1408,22 +1428,41 @@ static void Soc_WriteTopMessage (Soc_TopMessage_t TopMessage,long UsrCod)
static void Soc_WriteAuthorNote (struct UsrData *UsrDat)
{
- extern const char *Txt_View_public_profile;
+ extern const char *Txt_My_public_profile;
+ extern const char *Txt_Another_user_s_profile;
+ bool ItsMe = (Gbl.Usrs.Me.Logged &&
+ UsrDat->UsrCod == Gbl.Usrs.Me.UsrDat.UsrCod);
fprintf (Gbl.F.Out,"
");
/***** Show user's name inside form to go to user's public profile *****/
- Act_FormStartUnique (ActSeePubPrf);
- Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
- Act_LinkFormSubmitUnique (Txt_View_public_profile,"DAT_N_BOLD");
+ if (ItsMe)
+ {
+ Act_FormStartUnique (ActSeeMyPubPrf);
+ Act_LinkFormSubmitUnique (Txt_My_public_profile,"DAT_N_BOLD");
+ }
+ else
+ {
+ Act_FormStartUnique (ActSeeOthPubPrf);
+ Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
+ Act_LinkFormSubmitUnique (Txt_Another_user_s_profile,"DAT_N_BOLD");
+ }
Str_LimitLengthHTMLStr (UsrDat->FullName,16);
fprintf (Gbl.F.Out,"%s",UsrDat->FullName);
Act_FormEnd ();
/***** Show user's nickname inside form to go to user's public profile *****/
- Act_FormStartUnique (ActSeePubPrf);
- Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
- Act_LinkFormSubmitUnique (Txt_View_public_profile,"DAT_LIGHT");
+ if (ItsMe)
+ {
+ Act_FormStartUnique (ActSeeMyPubPrf);
+ Act_LinkFormSubmitUnique (Txt_My_public_profile,"DAT_N_BOLD");
+ }
+ else
+ {
+ Act_FormStartUnique (ActSeeOthPubPrf);
+ Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
+ Act_LinkFormSubmitUnique (Txt_Another_user_s_profile,"DAT_LIGHT");
+ }
fprintf (Gbl.F.Out," @%s",UsrDat->Nickname);
Act_FormEnd ();
@@ -2453,22 +2492,41 @@ static void Soc_WriteSocialComment (struct SocialComment *SocCom,
static void Soc_WriteAuthorComment (struct UsrData *UsrDat)
{
- extern const char *Txt_View_public_profile;
+ extern const char *Txt_My_public_profile;
+ extern const char *Txt_Another_user_s_profile;
+ bool ItsMe = (Gbl.Usrs.Me.Logged &&
+ UsrDat->UsrCod == Gbl.Usrs.Me.UsrDat.UsrCod);
fprintf (Gbl.F.Out,"