"
"![\"%s\"](\"%s/share64x64.png\"" "\\"%s\\"\"")
"
@@ -2226,6 +2283,30 @@ static void Soc_PutDisabledIconShare (unsigned NumShared)
Gbl.Title,Gbl.Title);
}
+/*****************************************************************************/
+/****************** Put disabled icon to mark as favourite *******************/
+/*****************************************************************************/
+
+static void Soc_PutDisabledIconFav (unsigned NumFavs)
+ {
+ extern const char *Txt_SOCIAL_NOTE_Favourited_by_X_USERS;
+ extern const char *Txt_SOCIAL_NOTE_Not_favourited_by_anyone;
+
+ if (NumFavs)
+ sprintf (Gbl.Title,Txt_SOCIAL_NOTE_Favourited_by_X_USERS,NumFavs);
+ else
+ strcpy (Gbl.Title,Txt_SOCIAL_NOTE_Not_favourited_by_anyone);
+
+ /***** Disabled icon to mark as favourite *****/
+ fprintf (Gbl.F.Out,"
"
@@ -2226,6 +2283,30 @@ static void Soc_PutDisabledIconShare (unsigned NumShared)
Gbl.Title,Gbl.Title);
}
+/*****************************************************************************/
+/****************** Put disabled icon to mark as favourite *******************/
+/*****************************************************************************/
+
+static void Soc_PutDisabledIconFav (unsigned NumFavs)
+ {
+ extern const char *Txt_SOCIAL_NOTE_Favourited_by_X_USERS;
+ extern const char *Txt_SOCIAL_NOTE_Not_favourited_by_anyone;
+
+ if (NumFavs)
+ sprintf (Gbl.Title,Txt_SOCIAL_NOTE_Favourited_by_X_USERS,NumFavs);
+ else
+ strcpy (Gbl.Title,Txt_SOCIAL_NOTE_Not_favourited_by_anyone);
+
+ /***** Disabled icon to mark as favourite *****/
+ fprintf (Gbl.F.Out,""
+ "![\"%s\"](\"%s/fav64x64.png\"" "\\"%s\\"\"")
"
+ "
",
+ Gbl.Prefs.IconsURL,
+ Gbl.Title,Gbl.Title);
+ }
+
/*****************************************************************************/
/************************* Form to share social note *************************/
/*****************************************************************************/
@@ -2244,7 +2325,7 @@ static void Soc_PutFormToShareSocialNote (long NotCod)
else
Act_FormStartUnique (ActShaSocNotGbl);
Soc_PutHiddenParamNotCod (NotCod);
- fprintf (Gbl.F.Out,""
+ ""
+ fprintf (Gbl.F.Out,"
"
" 0)
+ {
+ Act_FormStartUniqueAnchor (ActFavSocNotUsr,"timeline");
+ Usr_PutParamOtherUsrCodEncrypted ();
+ }
+ else
+ Act_FormStartUnique (ActFavSocNotGbl);
+ Soc_PutHiddenParamNotCod (NotCod);
+ fprintf (Gbl.F.Out,"
"
+ ""
+ "
",
+ Gbl.Prefs.IconsURL,
+ Txt_Mark_as_favourite,Txt_Mark_as_favourite);
+ Act_FormEnd ();
+ }
+
+/*****************************************************************************/
+/*************** Form to unshare (stop sharing) social note ******************/
+/*****************************************************************************/
+// All forms in this function and nested functions must have unique identifiers
+
+static void Soc_PutFormToUnshareSocialNote (long NotCod)
{
extern const char *Txt_Unshare;
/***** Form to share social publishing *****/
if (Gbl.Usrs.Other.UsrDat.UsrCod > 0)
{
- Act_FormStartUniqueAnchor (ActUnsSocPubUsr,"timeline");
+ Act_FormStartUniqueAnchor (ActUnsSocNotUsr,"timeline");
Usr_PutParamOtherUsrCodEncrypted ();
}
else
- Act_FormStartUnique (ActUnsSocPubGbl);
+ Act_FormStartUnique (ActUnsSocNotGbl);
Soc_PutHiddenParamNotCod (NotCod);
- fprintf (Gbl.F.Out,""
+ fprintf (Gbl.F.Out,"
"
" 0)
+ {
+ Act_FormStartUniqueAnchor (ActUnfSocNotUsr,"timeline");
+ Usr_PutParamOtherUsrCodEncrypted ();
+ }
+ else
+ Act_FormStartUnique (ActUnfSocNotGbl);
+ Soc_PutHiddenParamNotCod (NotCod);
+ fprintf (Gbl.F.Out,"");
+
+ /***** Mark social note as favourite *****/
+ NotCod = Soc_FavSocialNote ();
+
+ /***** Write updated timeline after marking as favourite (user) *****/
+ Soc_ShowTimelineUsrHighlightingNot (NotCod);
+
+ /***** End section *****/
+ fprintf (Gbl.F.Out," ");
+ }
+
+static long Soc_FavSocialNote (void)
+ {
+ extern const char *Txt_The_original_post_no_longer_exists;
+ struct SocialNote SocNot;
+ bool IAmTheAuthor;
+ bool IAmAFavouriterOfThisSocNot;
+ bool ICanFav;
+ char Query[256];
+
+ /***** Get the code of the social note to mark as favourite *****/
+ SocNot.NotCod = Soc_GetParamNotCod ();
+
+ /***** Get data of social note *****/
+ Soc_GetDataOfSocialNoteByCod (&SocNot);
+
+ if (SocNot.NotCod > 0)
+ {
+ IAmTheAuthor = (SocNot.UsrCod == Gbl.Usrs.Me.UsrDat.UsrCod);
+ IAmAFavouriterOfThisSocNot = Soc_CheckIfNoteIsFavouritedByUsr (SocNot.NotCod,
+ Gbl.Usrs.Me.UsrDat.UsrCod);
+ ICanFav = (Gbl.Usrs.Me.Logged &&
+ !IAmTheAuthor && // I am not the author
+ !IAmAFavouriterOfThisSocNot); // I have not favourited the note
+ if (ICanFav)
+ {
+ /***** Mark as favourite in database *****/
+ sprintf (Query,"INSERT IGNORE INTO social_notes_fav"
+ " (NotCod,UsrCod) VALUES ('%ld','%ld')",
+ SocNot.NotCod,
+ Gbl.Usrs.Me.UsrDat.UsrCod);
+ DB_QueryINSERT (Query,"can not favourite social note");
+
+ /* Update number of times this social note is favourited */
+ Soc_UpdateNumTimesANoteHasBeenFav (&SocNot);
+
+ /***** Show the social note corresponding
+ to the publishing just fav *****/
+ Soc_WriteSocialNote (&SocNot,
+ Soc_TOP_MESSAGE_FAV,Gbl.Usrs.Me.UsrDat.UsrCod,
+ true,true);
+ }
+ }
+ else
+ Lay_ShowAlert (Lay_WARNING,Txt_The_original_post_no_longer_exists);
+
+ return SocNot.NotCod;
+ }
+
/*****************************************************************************/
/***************** Unshare a previously shared social note *******************/
/*****************************************************************************/
@@ -2553,7 +2780,7 @@ void Soc_UnshareSocialNoteUsr (void)
/***** Get user whom profile is displayed *****/
Usr_GetParamOtherUsrCodEncryptedAndGetUsrData ();
- /***** Show user's profile *****/
+ /***** Show user's profile *****/
Prf_ShowUserProfile ();
/***** Start section *****/
@@ -2572,7 +2799,6 @@ void Soc_UnshareSocialNoteUsr (void)
static long Soc_UnshareSocialNote (void)
{
struct SocialNote SocNot;
- struct SocialPublishing SocPub; // Used to print message indicating that I have unshared
bool IAmTheAuthor;
bool IAmAPublisherOfThisSocNot;
bool ICanUnshare;
@@ -2600,9 +2826,9 @@ static long Soc_UnshareSocialNote (void)
/***** Show the social note corresponding
to the publishing just unshared *****/
- SocPub.PublisherCod = Gbl.Usrs.Me.UsrDat.UsrCod;
- SocPub.PubType = Soc_PUB_UNKNOWN; // Used to print message indicating that I have unshared
- Soc_WriteSocialNote (&SocNot,&SocPub,true,true);
+ Soc_WriteSocialNote (&SocNot,
+ Soc_TOP_MESSAGE_UNSHARED,Gbl.Usrs.Me.UsrDat.UsrCod,
+ true,true);
}
return SocNot.NotCod;
@@ -2627,6 +2853,84 @@ static void Soc_UnshareASocialPublishingFromDB (struct SocialNote *SocNot)
DB_QueryDELETE (Query,"can not remove a social publishing");
}
+/*****************************************************************************/
+/******* Stop marking as favourite a previously favourited social note *******/
+/*****************************************************************************/
+
+void Soc_UnfavSocialNoteGbl (void)
+ {
+ long NotCod;
+
+ /***** Stop marking as favourite a previously favourited social note *****/
+ NotCod = Soc_UnfavSocialNote ();
+
+ /***** Write updated timeline after unfav (global) *****/
+ Soc_ShowTimelineGblHighlightingNot (NotCod);
+ }
+
+void Soc_UnfavSocialNoteUsr (void)
+ {
+ long NotCod;
+
+ /***** Get user whom profile is displayed *****/
+ Usr_GetParamOtherUsrCodEncryptedAndGetUsrData ();
+
+ /***** Show user's profile *****/
+ Prf_ShowUserProfile ();
+
+ /***** Start section *****/
+ fprintf (Gbl.F.Out,"");
+
+ /***** Unshare a previously shared social note *****/
+ NotCod = Soc_UnfavSocialNote ();
+
+ /***** Write updated timeline after unfav (user) *****/
+ Soc_ShowTimelineUsrHighlightingNot (NotCod);
+
+ /***** End section *****/
+ fprintf (Gbl.F.Out," ");
+ }
+
+static long Soc_UnfavSocialNote (void)
+ {
+ struct SocialNote SocNot;
+ bool IAmTheAuthor;
+ bool IAmAFavouriterOfThisSocNot;
+ bool ICanUnfav;
+ char Query[256];
+
+ /***** Get data of social note *****/
+ SocNot.NotCod = Soc_GetParamNotCod ();
+ Soc_GetDataOfSocialNoteByCod (&SocNot);
+
+ IAmTheAuthor = (SocNot.UsrCod == Gbl.Usrs.Me.UsrDat.UsrCod);
+ IAmAFavouriterOfThisSocNot = Soc_CheckIfNoteIsFavouritedByUsr (SocNot.NotCod,
+ Gbl.Usrs.Me.UsrDat.UsrCod);
+ ICanUnfav = (Gbl.Usrs.Me.Logged &&
+ !IAmTheAuthor && // I am not the author
+ IAmAFavouriterOfThisSocNot); // I have favourited the note
+ if (ICanUnfav)
+ {
+ /***** Delete the mark as favourite from database *****/
+ sprintf (Query,"DELETE FROM social_notes_fav"
+ " WHERE NotCod='%ld' AND UsrCod='%ld'",
+ SocNot.NotCod,
+ Gbl.Usrs.Me.UsrDat.UsrCod);
+ DB_QueryDELETE (Query,"can not unfavourite social note");
+
+ /***** Update number of times this social note is favourited *****/
+ Soc_UpdateNumTimesANoteHasBeenFav (&SocNot);
+
+ /***** Show the social note corresponding
+ to the publishing just unfavourited *****/
+ Soc_WriteSocialNote (&SocNot,
+ Soc_TOP_MESSAGE_UNFAV,Gbl.Usrs.Me.UsrDat.UsrCod,
+ true,true);
+ }
+
+ return SocNot.NotCod;
+ }
+
/*****************************************************************************/
/******************* Request the removal of a social note ********************/
/*****************************************************************************/
@@ -2683,7 +2987,9 @@ static void Soc_RequestRemovalSocialNote (void)
Lay_ShowAlert (Lay_WARNING,Txt_Do_you_really_want_to_remove_the_following_post);
/* Show social note */
- Soc_WriteSocialNote (&SocNot,NULL,false,true);
+ Soc_WriteSocialNote (&SocNot,
+ Soc_TOP_MESSAGE_NONE,-1L,
+ false,true);
/***** Form to ask for confirmation to remove this social post *****/
/* Start form */
@@ -3051,6 +3357,20 @@ static bool Soc_CheckIfNoteIsPublishedInTimelineByUsr (long NotCod,long UsrCod)
return (DB_QueryCOUNT (Query,"can not check if a user has published a social note") != 0);
}
+/*****************************************************************************/
+/*************** Check if a user has favourited a social note ****************/
+/*****************************************************************************/
+
+static bool Soc_CheckIfNoteIsFavouritedByUsr (long NotCod,long UsrCod)
+ {
+ char Query[256];
+
+ sprintf (Query,"SELECT COUNT(*) FROM social_notes_fav"
+ " WHERE NotCod='%ld' AND UsrCod='%ld'",
+ NotCod,UsrCod);
+ return (DB_QueryCOUNT (Query,"can not check if a user has favourited a social note") != 0);
+ }
+
/*****************************************************************************/
/******** Get number of times a note code has been shared in timeline ********/
/*****************************************************************************/
@@ -3070,6 +3390,23 @@ static void Soc_UpdateNumTimesANoteHasBeenShared (struct SocialNote *SocNot)
SocNot->NumShared = (unsigned) DB_QueryCOUNT (Query,"can not get number of times a note has been shared");
}
+/*****************************************************************************/
+/************ Get number of times a note code has been favourited ************/
+/*****************************************************************************/
+
+static void Soc_UpdateNumTimesANoteHasBeenFav (struct SocialNote *SocNot)
+ {
+ char Query[256];
+
+ /***** Get number of times (users) this note has been favourited *****/
+ sprintf (Query,"SELECT COUNT(*) FROM social_notes_fav"
+ " WHERE NotCod='%ld'"
+ " AND UsrCod<>'%ld'", // Extra check
+ SocNot->NotCod,
+ SocNot->UsrCod); // The author
+ SocNot->NumFavs = (unsigned) DB_QueryCOUNT (Query,"can not get number of times a note has been favourited");
+ }
+
/*****************************************************************************/
/**************** Show users who have shared this social note ****************/
/*****************************************************************************/
@@ -3176,6 +3513,9 @@ static void Soc_GetDataOfSocialNoteByCod (struct SocialNote *SocNot)
/***** Get number of times this social note has been shared *****/
Soc_UpdateNumTimesANoteHasBeenShared (SocNot);
+
+ /***** Get number of times this social note has been favourited *****/
+ Soc_UpdateNumTimesANoteHasBeenFav (SocNot);
}
else
/***** Reset fields of social note *****/
@@ -3240,6 +3580,19 @@ static void Soc_GetDataOfSocialPublishingFromRow (MYSQL_ROW row,struct SocialPub
/* Get type of publishing (row[3]) */
SocPub->PubType = Soc_GetPubTypeFromStr ((const char *) row[3]);
+ switch (SocPub->PubType)
+ {
+ case Soc_PUB_UNKNOWN:
+ case Soc_PUB_ORIGINAL_NOTE:
+ SocPub->TopMessage = Soc_TOP_MESSAGE_NONE;
+ break;
+ case Soc_PUB_SHARED_NOTE:
+ SocPub->TopMessage = Soc_TOP_MESSAGE_SHARED;
+ break;
+ case Soc_PUB_COMMENT_TO_NOTE:
+ SocPub->TopMessage = Soc_TOP_MESSAGE_COMMENTED;
+ break;
+ }
/* Get time of the note (row[4]) */
SocPub->DateTimeUTC = Dat_GetUNIXTimeFromStr (row[4]);
diff --git a/swad_social.h b/swad_social.h
index 2f5678087..e25fdcc79 100644
--- a/swad_social.h
+++ b/swad_social.h
@@ -113,8 +113,13 @@ void Soc_ReceiveCommentUsr (void);
void Soc_ShareSocialNoteGbl (void);
void Soc_ShareSocialNoteUsr (void);
+void Soc_FavSocialNoteGbl (void);
+void Soc_FavSocialNoteUsr (void);
+
void Soc_UnshareSocialNoteGbl (void);
void Soc_UnshareSocialNoteUsr (void);
+void Soc_UnfavSocialNoteGbl (void);
+void Soc_UnfavSocialNoteUsr (void);
void Soc_RequestRemSocialNoteGbl (void);
void Soc_RequestRemSocialNoteUsr (void);
diff --git a/swad_text.c b/swad_text.c
index 719e60a06..ffc119958 100644
--- a/swad_text.c
+++ b/swad_text.c
@@ -11055,6 +11055,27 @@ const char *Txt_Family_address =
"Endereço Família";
#endif
+const char *Txt_Favourite =
+#if L==1
+ "Favorit";
+#elif L==2
+ "Favorit";
+#elif L==3
+ "Favourite";
+#elif L==4
+ "Favorito";
+#elif L==5
+ "Favori";
+#elif L==6
+ "Favorito"; // Okoteve traducción
+#elif L==7
+ "Preferito";
+#elif L==8
+ "Ulubiony";
+#elif L==9
+ "Favorito";
+#endif
+
const char *Txt_Feedback =
#if L==1
"Realimentación"; // Necessita traduccio
@@ -16403,6 +16424,27 @@ const char *Txt_Mark_all_notifications_as_read =
"Marcar todas as notificações como lidas";
#endif
+const char *Txt_Mark_as_favourite =
+#if L==1
+ "Marca com favorit";
+#elif L==2
+ "Markieren als Favorit";
+#elif L==3
+ "Mark as favourite";
+#elif L==4
+ "Marcar como favorito";
+#elif L==5
+ "Marquer comme favori";
+#elif L==6
+ "Marcar como favorito"; // Okoteve traducción
+#elif L==7
+ "Segnare come preferito";
+#elif L==8
+ "Oznacz jako ulubiony";
+#elif L==9
+ "Marcar como favorito";
+#endif
+
const char *Txt_Marks_management_area =
#if L==1
"Zona d'administració de qualificacions";
@@ -35740,6 +35782,27 @@ const char *Txt_SOCIAL_NOTE[Soc_NUM_NOTE_TYPES] =
#endif
};
+const char *Txt_SOCIAL_NOTE_Favourited_by_X_USERS = // Warning: it is very important to include %u in the following sentences
+#if L==1
+ "Marcat com favorit per %u";
+#elif L==2
+ "Von %u vorgemerkt";
+#elif L==3
+ "Favourited by %u";
+#elif L==4
+ "Marcado como favorito por %u";
+#elif L==5
+ "Ajouté aux favoris par %u";
+#elif L==6
+ "Marcado como favorito por %u"; // Okoteve traducción
+#elif L==7
+ "Preferiti da %u";
+#elif L==8
+ "Dodane do ulubionych przez %u";
+#elif L==9
+ "Marcado como favorito por %u";
+#endif
+
const char *Txt_SOCIAL_NOTE_Shared_by_X_USERS = // Warning: it is very important to include %u in the following sentences
#if L==1
"Compartit per %u";
@@ -35761,6 +35824,27 @@ const char *Txt_SOCIAL_NOTE_Shared_by_X_USERS = // Warning: it is very important
"Compartilhado por %u";
#endif
+const char *Txt_SOCIAL_NOTE_Not_favourited_by_anyone = // No longer shared
+#if L==1
+ "No marcat com favorit per ningú";
+#elif L==2
+ "Niemand hat sie als Favorit markiert";
+#elif L==3
+ "Not favourited by anyone";
+#elif L==4
+ "No marcado como favorito por nadie";
+#elif L==5
+ "Personne n'a marqué comme favori";
+#elif L==6
+ "No marcado como favorito por nadie"; // Okoteve traducción
+#elif L==7
+ "Non preferiti da chiunque";
+#elif L==8
+ "Nie przez nikogo ulubionych";
+#elif L==9
+ "Não marcado como favorito por qualquer pessoa";
+#endif
+
const char *Txt_SOCIAL_NOTE_Not_shared_by_anyone = // No longer shared
#if L==1
"No compartit per ningú";
@@ -35803,6 +35887,27 @@ const char *Txt_SOCIAL_USER_has_commented =
"comentou:";
#endif
+const char *Txt_SOCIAL_USER_has_marked_as_favourite =
+#if L==1
+ "ha marcat com favorit:";
+#elif L==2
+ "hat als Favorit markiert:";
+#elif L==3
+ "has marked as favourite:";
+#elif L==4
+ "ha marcado como favorito:";
+#elif L==5
+ "a marqué en tant que favori:";
+#elif L==6
+ "ha marcado como favorito:"; // Okoteve traducción
+#elif L==7
+ "ha segnato come preferito:";
+#elif L==8
+ "oznaczone jako ulubiony:";
+#elif L==9
+ "marcou como favorito:";
+#endif
+
const char *Txt_SOCIAL_USER_has_shared =
#if L==1
"ha compartit:";
@@ -35845,6 +35950,27 @@ const char *Txt_SOCIAL_USER_has_stopped_sharing =
"parou compartilhar:";
#endif
+const char *Txt_SOCIAL_USER_has_unmarked_as_favourite =
+#if L==1
+ "ha desmarcat com favorit:";
+#elif L==2
+ "hat als Favorit unmarkiert:";
+#elif L==3
+ "has unmarked as favourite:";
+#elif L==4
+ "ha desmarcado como favorito:";
+#elif L==5
+ "a pas marqué en tant que favori:";
+#elif L==6
+ "ha desmarcado como favorito:"; // Okoteve traducción
+#elif L==7
+ "ha smarcato come preferito:";
+#elif L==8
+ "nieoznaczonych jako ulubiony:";
+#elif L==9
+ "desmarcou como favorito:";
+#endif
+
const char *Txt_Sort_degrees_by =
#if L==1
"Ordenar titulacions per";
"
+ ""
+ "
",
+ Gbl.Prefs.IconsURL,
+ Txt_Favourite,Txt_Favourite);
+ Act_FormEnd ();
+ }
+
/*****************************************************************************/
/******************** Form to remove social publishing ***********************/
/*****************************************************************************/
@@ -2440,7 +2579,9 @@ static long Soc_ReceiveComment (void)
DB_QueryINSERT (Query,"can not store comment content");
/***** Show the social note just commented *****/
- Soc_WriteSocialNote (&SocNot,&SocPub,true,true);
+ Soc_WriteSocialNote (&SocNot,
+ Soc_TOP_MESSAGE_COMMENTED,Gbl.Usrs.Me.UsrDat.UsrCod,
+ true,true);
}
}
else
@@ -2531,6 +2672,92 @@ static long Soc_ShareSocialNote (void)
return SocNot.NotCod;
}
+/*****************************************************************************/
+/********************** Mark a social note as favourite **********************/
+/*****************************************************************************/
+
+void Soc_FavSocialNoteGbl (void)
+ {
+ long NotCod;
+
+ /***** Mark social note as favourite *****/
+ NotCod = Soc_FavSocialNote ();
+
+ /***** Write updated timeline after marking as favourite (global) *****/
+ Soc_ShowTimelineGblHighlightingNot (NotCod);
+ }
+
+void Soc_FavSocialNoteUsr (void)
+ {
+ long NotCod;
+
+ /***** Get user whom profile is displayed *****/
+ Usr_GetParamOtherUsrCodEncryptedAndGetUsrData ();
+
+ /***** Show user's profile *****/
+ Prf_ShowUserProfile ();
+
+ /***** Start section *****/
+ fprintf (Gbl.F.Out,"