Marown/swad-core
Marown/swad-core
1
0
Fork 0
mirror of https://github.com/acanas/swad-core.git synced 2024-05-28 20:43:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version 15.100

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2016-01-06 22:16:08 +01:00
parent 1a146f2e43
commit 7159652e3d
3 changed files with 36 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
swad_changelog.h
View File

@ -124,14 +124,15 @@ En definitiva, se estar
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.99.1 (2016-01-05)"
#define Log_PLATFORM_VERSION "SWAD 15.100 (2016-01-06)"
#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.99.1: Jan 05, 2016 Change in message in social timeline. (? lines)
Version 15.100: Jan 06, 2016 When an author removes a social note, all the publishings of this note are removed. (190842 lines)
Version 15.99.1: Jan 05, 2016 Change in message in social timeline. (190917 lines)
Version 15.99: Jan 05, 2016 Changes in social timeline. (190892 lines)
Version 15.98: Jan 05, 2016 If a social note is unavailable and is shared, put button to unshare.
Several bugs in social timeline fixed. (190789 lines)

134
swad_social.c
View File

@ -166,10 +166,8 @@ static void Soc_RequestRemovalSocialPublishing (void);
static void Soc_RemoveSocialPublishing (void);
static void Soc_RemoveASocialPublishingFromDB (const struct SocialPublishing *SocPub,
struct SocialNote *SocNot);
static void Soc_CheckAndDeleteASocialNoteFromDB (struct SocialNote *SocNot);
static bool Soc_CheckIfNoteIsPublishedInTimelineByUsr (long NotCod,long UsrCod);
static unsigned long Soc_GetNumPubsOfANote (long NotCod);
static void Soc_UpdateNumTimesANoteHasBeenShared (struct SocialNote *SocNot);
static void Soc_ShowUsrsWhoHaveSharedSocialNote (const struct SocialNote *SocNot);
static void Soc_GetDataOfSocialPublishingByCod (struct SocialPublishing *SocPub);
@ -1415,7 +1413,6 @@ static void Soc_UnshareSocialPublishing (void)
struct SocialPublishing SocPub;
struct SocialNote SocNot;
bool ICanUnshare;
unsigned NumRemainingPubs;
/***** Get the code of the social publishing to unshare *****/
SocPub.PubCod = Soc_GetParamPubCod ();
@ -1428,28 +1425,22 @@ static void Soc_UnshareSocialPublishing (void)
Soc_GetDataOfSocialNoteByCod (&SocNot);
ICanUnshare = (Gbl.Usrs.Me.Logged &&
SocPub.AuthorCod != Gbl.Usrs.Me.UsrDat.UsrCod); // I have shared the note
SocPub.PublisherCod == Gbl.Usrs.Me.UsrDat.UsrCod && // I have shared the note
SocPub.AuthorCod != Gbl.Usrs.Me.UsrDat.UsrCod); // I am not the author
if (ICanUnshare)
{
/***** Delete social publishing from database *****/
Soc_UnshareASocialPublishingFromDB (&SocNot);
/***** Count number of remaining publishings *****/
NumRemainingPubs = Soc_GetNumPubsOfANote (SocNot.NotCod);
/***** Update number of times this social note is shared *****/
Soc_UpdateNumTimesANoteHasBeenShared (&SocNot);
/***** Message of success *****/
Lay_ShowAlert (Lay_SUCCESS,Txt_SOCIAL_PUBLISHING_Unshared);
/***** Show the social note corresponding to the publishing
just unshared if it yet exists *****/
if (NumRemainingPubs)
{
/* Update number of times this social note is shared */
Soc_UpdateNumTimesANoteHasBeenShared (&SocNot);
/* Show social note */
Soc_WriteSocialNote (&SocPub,&SocNot,true,true);
}
/***** Show the social note corresponding
to the publishing just unshared *****/
Soc_WriteSocialNote (&SocPub,&SocNot,true,true);
}
}
@ -1470,10 +1461,6 @@ static void Soc_UnshareASocialPublishingFromDB (struct SocialNote *SocNot)
Gbl.Usrs.Me.UsrDat.UsrCod,
Gbl.Usrs.Me.UsrDat.UsrCod);
DB_QueryDELETE (Query,"can not remove a social publishing");
/***** Check if this was the unique publishing of this note.
If so, remove the note *****/
Soc_CheckAndDeleteASocialNoteFromDB (SocNot);
}
/*****************************************************************************/
@ -1529,7 +1516,9 @@ static void Soc_RequestRemovalSocialPublishing (void)
Soc_GetDataOfSocialNoteByCod (&SocNot);
ICanRemove = (Gbl.Usrs.Me.Logged &&
SocPub.PublisherCod == Gbl.Usrs.Me.UsrDat.UsrCod);
SocPub.PublisherCod == Gbl.Usrs.Me.UsrDat.UsrCod &&
SocPub.AuthorCod == Gbl.Usrs.Me.UsrDat.UsrCod &&
SocNot.UsrCod == Gbl.Usrs.Me.UsrDat.UsrCod);
if (ICanRemove)
{
if (Soc_CheckIfNoteIsPublishedInTimelineByUsr (SocNot.NotCod,SocNot.UsrCod))
@ -1595,12 +1584,10 @@ void Soc_RemoveSocialPubUsr (void)
static void Soc_RemoveSocialPublishing (void)
{
extern const char *Txt_SOCIAL_PUBLISHING_Removed_but_shared_by_others;
extern const char *Txt_SOCIAL_PUBLISHING_Removed;
struct SocialPublishing SocPub;
struct SocialNote SocNot;
bool ICanRemove;
unsigned NumRemainingPubs;
/***** Get the code of the social publishing to remove *****/
SocPub.PubCod = Soc_GetParamPubCod ();
@ -1613,35 +1600,21 @@ static void Soc_RemoveSocialPublishing (void)
Soc_GetDataOfSocialNoteByCod (&SocNot);
ICanRemove = (Gbl.Usrs.Me.Logged &&
SocPub.PublisherCod == Gbl.Usrs.Me.UsrDat.UsrCod);
SocPub.PublisherCod == Gbl.Usrs.Me.UsrDat.UsrCod &&
SocPub.AuthorCod == Gbl.Usrs.Me.UsrDat.UsrCod &&
SocNot.UsrCod == Gbl.Usrs.Me.UsrDat.UsrCod);
if (ICanRemove)
{
/***** Delete social publishing from database *****/
Soc_RemoveASocialPublishingFromDB (&SocPub,&SocNot);
/***** Count number of remaining publishings *****/
NumRemainingPubs = Soc_GetNumPubsOfANote (SocNot.NotCod);
/***** Message of success *****/
Lay_ShowAlert (Lay_SUCCESS,
NumRemainingPubs ? Txt_SOCIAL_PUBLISHING_Removed_but_shared_by_others :
Txt_SOCIAL_PUBLISHING_Removed);
/***** Show the social note corresponding to the publishing
just removed if it yet exists *****/
if (NumRemainingPubs)
{
/* Update number of times this social note is shared */
Soc_UpdateNumTimesANoteHasBeenShared (&SocNot);
/* Show social note */
Soc_WriteSocialNote (&SocPub,&SocNot,true,true);
}
Lay_ShowAlert (Lay_SUCCESS,Txt_SOCIAL_PUBLISHING_Removed);
}
}
/*****************************************************************************/
/**************** Delete a social publishing from database *******************/
/**************** Remove a social publishing from database *******************/
/*****************************************************************************/
static void Soc_RemoveASocialPublishingFromDB (const struct SocialPublishing *SocPub,
@ -1649,60 +1622,33 @@ static void Soc_RemoveASocialPublishingFromDB (const struct SocialPublishing *So
{
char Query[128];
/***** Remove social publishing *****/
/***** Remove all the social publishings of this note *****/
sprintf (Query,"DELETE FROM social_timeline"
" WHERE PubCod='%ld'"
" AND NotCod='%ld'" // Extra check: this is the note
" AND PublisherCod='%ld'" // Extra check: I have published this note
" WHERE NotCod='%ld'"
" AND AuthorCod='%ld'", // Extra check: I am the author
SocPub->PubCod,
SocNot->NotCod,
Gbl.Usrs.Me.UsrDat.UsrCod,
Gbl.Usrs.Me.UsrDat.UsrCod);
DB_QueryDELETE (Query,"can not remove a social publishing");
/***** Check if this was the unique publishing of this note.
If so, remove the note *****/
Soc_CheckAndDeleteASocialNoteFromDB (SocNot);
}
/***** Remove social note *****/
sprintf (Query,"DELETE FROM social_notes"
" WHERE NotCod='%ld'"
" AND UsrCod='%ld'", // Extra check: I am the author
SocNot->NotCod,
Gbl.Usrs.Me.UsrDat.UsrCod);
DB_QueryDELETE (Query,"can not remove a social note");
/*****************************************************************************/
/**** Check if deletion is possible and delete a social note from database ***/
/*****************************************************************************/
static void Soc_CheckAndDeleteASocialNoteFromDB (struct SocialNote *SocNot)
{
char Query[128];
unsigned long NumPubs;
/***** Count number of times this note is published *****/
NumPubs = Soc_GetNumPubsOfANote (SocNot->NotCod);
if (NumPubs == 0) // There are no publishings of this note
if (SocNot->NoteType == Soc_NOTE_SOCIAL_POST)
{
/***** Remove social note *****/
sprintf (Query,"DELETE FROM social_notes WHERE NotCod='%ld'",
SocNot->NotCod);
DB_QueryDELETE (Query,"can not remove a social note");
if (SocNot->NoteType == Soc_NOTE_SOCIAL_POST)
{
/***** Remove social post *****/
sprintf (Query,"DELETE FROM social_posts WHERE PstCod='%ld'",
SocNot->Cod);
DB_QueryDELETE (Query,"can not remove a social post");
}
/***** Repair timeline removing the publishing that not point to any note.
This may be due to concurrency errors *****/
// TODO: Check if this query is too slow for big tables. If so, make it from time to time
sprintf (Query,"DELETE LOW_PRIORITY FROM social_timeline"
" WHERE NotCod NOT IN"
" (SELECT NotCod FROM social_notes)");
DB_QueryDELETE (Query,"can not repair timeline");
/***** Reset social note *****/
Soc_ResetSocialNote (SocNot);
/***** Remove social post *****/
sprintf (Query,"DELETE FROM social_posts"
" WHERE PstCod='%ld'",
SocNot->Cod);
DB_QueryDELETE (Query,"can not remove a social post");
}
/***** Reset social note *****/
Soc_ResetSocialNote (SocNot);
}
/*****************************************************************************/
@ -1719,20 +1665,6 @@ static bool Soc_CheckIfNoteIsPublishedInTimelineByUsr (long NotCod,long UsrCod)
return (DB_QueryCOUNT (Query,"can not check if a user has published a social note") != 0);
}
/*****************************************************************************/
/*********** Get number of publishings in timeline of a note code ************/
/*****************************************************************************/
static unsigned long Soc_GetNumPubsOfANote (long NotCod)
{
char Query[128];
sprintf (Query,"SELECT COUNT(*) FROM social_timeline"
" WHERE NotCod='%ld'",
NotCod);
return DB_QueryCOUNT (Query,"can not get number of publishing of a note");
}
/*****************************************************************************/
/******** Get number of times a note code has been shared in timeline ********/
/*****************************************************************************/

21
swad_text.c
View File

@ -35594,27 +35594,6 @@ const char *Txt_SOCIAL_PUBLISHING_Removed =
"Removido.";
#endif
const char *Txt_SOCIAL_PUBLISHING_Removed_but_shared_by_others =
#if L==1
"Eliminat però encara compartit per altres.";
#elif L==2
"Entfernt, sondern von anderen geteilt.";
#elif L==3
"Removed but shared by others.";
#elif L==4
"Eliminado pero aún compartido por otros.";
#elif L==5
"Supprimé, mais partagé par d'autres.";
#elif L==6
"Eliminado pero aún compartido por otros."; // Okoteve traducción
#elif L==7
"Rimosso ma condiviso da altri.";
#elif L==8
"Usuniete ale podzielają inni.";
#elif L==9
"Removido mas compartilhado por outros.";
#endif
const char *Txt_SOCIAL_PUBLISHING_Shared =
#if L==1
"Compartit.";