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 18.57.3

This commit is contained in:
Antonio Cañas Vargas 2019-02-24 16:14:45 +01:00
parent 0870da6cac
commit 65880ad108
4 changed files with 22 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
swad_action.c
View File

@ -1615,8 +1615,8 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
/* ActRcvSocComGbl */{1503,-1,TabUnk,ActSeeSocTmlGbl ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_DATA,Act_BRW_1ST_TAB,Soc_ShowTimelineGbl1 ,Soc_ReceiveCommentGbl ,NULL},
/* ActShaSocNotGbl */{1495,-1,TabUnk,ActSeeSocTmlGbl ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,Soc_ShowTimelineGbl1 ,Soc_ShareSocialNoteGbl ,NULL},
/* ActUnsSocNotGbl */{1496,-1,TabUnk,ActSeeSocTmlGbl ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,Soc_ShowTimelineGbl1 ,Soc_UnshareSocialNoteGbl ,NULL},
/* ActFavSocNotGbl */{1512,-1,TabUnk,ActSeeSocTmlGbl ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Soc_FavSocialNoteGbl_new ,NULL},
/* ActUnfSocNotGbl */{1513,-1,TabUnk,ActSeeSocTmlGbl ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Soc_UnfavSocialNoteGbl_new ,NULL},
/* ActFavSocNotGbl */{1512,-1,TabUnk,ActSeeSocTmlGbl ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Soc_FavSocialNoteGbl ,NULL},
/* ActUnfSocNotGbl */{1513,-1,TabUnk,ActSeeSocTmlGbl ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Soc_UnfavSocialNoteGbl ,NULL},
/* ActFavSocComGbl */{1516,-1,TabUnk,ActSeeSocTmlGbl ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,Soc_ShowTimelineGbl1 ,Soc_FavSocialCommentGbl ,NULL},
/* ActUnfSocComGbl */{1517,-1,TabUnk,ActSeeSocTmlGbl ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,Soc_ShowTimelineGbl1 ,Soc_UnfavSocialCommentGbl ,NULL},
/* ActReqRemSocPubGbl*/{1494,-1,TabUnk,ActSeeSocTmlGbl ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,Soc_ShowTimelineGbl1 ,Soc_RequestRemSocialNoteGbl ,NULL},
@ -1630,8 +1630,8 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
/* ActRcvSocComUsr */{1504,-1,TabUnk,ActSeeSocPrf ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_DATA,Act_BRW_1ST_TAB,NULL ,Soc_ReceiveCommentUsr ,NULL},
/* ActShaSocNotUsr */{1499,-1,TabUnk,ActSeeSocPrf ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Soc_ShareSocialNoteUsr ,NULL},
/* ActUnsSocNotUsr */{1500,-1,TabUnk,ActSeeSocPrf ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Soc_UnshareSocialNoteUsr ,NULL},
/* ActFavSocNotUsr */{1514,-1,TabUnk,ActSeeSocPrf ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Soc_FavSocialNoteUsr_new ,NULL},
/* ActUnfSocNotUsr */{1515,-1,TabUnk,ActSeeSocPrf ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Soc_UnfavSocialNoteUsr_new ,NULL},
/* ActFavSocNotUsr */{1514,-1,TabUnk,ActSeeSocPrf ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Soc_FavSocialNoteUsr ,NULL},
/* ActUnfSocNotUsr */{1515,-1,TabUnk,ActSeeSocPrf ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Soc_UnfavSocialNoteUsr ,NULL},
/* ActFavSocComUsr */{1518,-1,TabUnk,ActSeeSocPrf ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Soc_FavSocialCommentUsr ,NULL},
/* ActUnfSocComUsr */{1519,-1,TabUnk,ActSeeSocPrf ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Soc_UnfavSocialCommentUsr ,NULL},
/* ActReqRemSocPubUsr*/{1501,-1,TabUnk,ActSeeSocPrf ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Soc_RequestRemSocialNoteUsr ,NULL},

3
swad_changelog.h
View File

@ -429,10 +429,11 @@ En OpenSWAD:
ps2pdf source.ps destination.pdf
*/
#define Log_PLATFORM_VERSION "SWAD 18.57.2 (2019-02-24)"
#define Log_PLATFORM_VERSION "SWAD 18.57.3 (2019-02-24)"
#define CSS_FILE "swad18.57.css"
#define JS_FILE "swad18.57.js"
/*
Version 18.57.3: Feb 24, 2019 Changes in social timeline related to AJAX and favourites. (237804 lines)
Version 18.57.2: Feb 24, 2019 Changes in social timeline related to AJAX and favourites. (237827 lines)
Version 18.57.1: Feb 24, 2019 Changes in social timeline related to AJAX and favourites. (237862 lines)
Version 18.57: Feb 23, 2019 Favourites in social notes is made in AJAX without reloading page. (237892 lines)

47
swad_social.c
View File

@ -215,13 +215,13 @@ static long Soc_GetParamPubCod (void);
static long Soc_ReceiveComment (void);
static long Soc_ShareSocialNote (void);
static void Soc_FavSocialNote_new (struct SocialNote *SocNot);
static void Soc_FavSocialNote (struct SocialNote *SocNot);
static long Soc_FavSocialComment (void);
static void Soc_CreateNotifToAuthor (long AuthorCod,long PubCod,
Ntf_NotifyEvent_t NotifyEvent);
static long Soc_UnshareSocialNote (void);
static void Soc_UnfavSocialNote_new (struct SocialNote *SocNot);
static void Soc_UnfavSocialNote (struct SocialNote *SocNot);
static long Soc_UnfavSocialComment (void);
static void Soc_RequestRemovalSocialNote (void);
@ -3209,7 +3209,7 @@ static long Soc_ShareSocialNote (void)
/********************** Mark a social note as favourite **********************/
/*****************************************************************************/
void Soc_FavSocialNoteGbl_new (void)
void Soc_FavSocialNoteGbl (void)
{
struct SocialNote SocNot;
@ -3217,7 +3217,7 @@ void Soc_FavSocialNoteGbl_new (void)
Soc_GetParamsWhichUsrs ();
/***** Mark social note as favourite *****/
Soc_FavSocialNote_new (&SocNot);
Soc_FavSocialNote (&SocNot);
/***** Write HTML inside DIV with form to unfav *****/
Soc_PutFormToUnfavSocialNote_new (&SocNot);
@ -3226,7 +3226,7 @@ void Soc_FavSocialNoteGbl_new (void)
Gbl.Layout.DivsEndWritten = Gbl.Layout.HTMLEndWritten = true;
}
void Soc_FavSocialNoteUsr_new (void)
void Soc_FavSocialNoteUsr (void)
{
struct SocialNote SocNot;
@ -3234,7 +3234,7 @@ void Soc_FavSocialNoteUsr_new (void)
Usr_GetParamOtherUsrCodEncryptedAndGetUsrData ();
/***** Mark social note as favourite *****/
Soc_FavSocialNote_new (&SocNot);
Soc_FavSocialNote (&SocNot);
/***** Write HTML inside DIV with form to unfav *****/
Soc_PutFormToUnfavSocialNote_new (&SocNot);
@ -3243,30 +3243,7 @@ void Soc_FavSocialNoteUsr_new (void)
Gbl.Layout.DivsEndWritten = Gbl.Layout.HTMLEndWritten = true;
}
//void Soc_FavSocialNoteUsr (void)
// {
// long NotCod;
//
// /***** Get user whom profile is displayed *****/
// Usr_GetParamOtherUsrCodEncryptedAndGetUsrData ();
//
// /***** Show user's profile *****/
// Prf_ShowUserProfile (&Gbl.Usrs.Other.UsrDat);
//
// /***** Start section *****/
// Lay_StartSection (Soc_TIMELINE_SECTION_ID);
//
// /***** Mark social note as favourite *****/
// NotCod = Soc_FavSocialNote ();
//
// /***** Write updated timeline after marking as favourite (user) *****/
// Soc_ShowTimelineUsrHighlightingNot (NotCod);
//
// /***** End section *****/
// Lay_EndSection ();
// }
static void Soc_FavSocialNote_new (struct SocialNote *SocNot)
static void Soc_FavSocialNote (struct SocialNote *SocNot)
{
extern const char *Txt_The_original_post_no_longer_exists;
bool ItsMe;
@ -3568,7 +3545,7 @@ static long Soc_UnshareSocialNote (void)
/******* Stop marking as favourite a previously favourited social note *******/
/*****************************************************************************/
void Soc_UnfavSocialNoteGbl_new (void)
void Soc_UnfavSocialNoteGbl (void)
{
struct SocialNote SocNot;
@ -3576,7 +3553,7 @@ void Soc_UnfavSocialNoteGbl_new (void)
Soc_GetParamsWhichUsrs ();
/***** Stop marking as favourite a previously favourited social note *****/
Soc_UnfavSocialNote_new (&SocNot);
Soc_UnfavSocialNote (&SocNot);
/***** Write HTML inside DIV with form to fav *****/
Soc_PutFormToFavSocialNote_new (&SocNot);
@ -3585,7 +3562,7 @@ void Soc_UnfavSocialNoteGbl_new (void)
Gbl.Layout.DivsEndWritten = Gbl.Layout.HTMLEndWritten = true;
}
void Soc_UnfavSocialNoteUsr_new (void)
void Soc_UnfavSocialNoteUsr (void)
{
struct SocialNote SocNot;
@ -3593,7 +3570,7 @@ void Soc_UnfavSocialNoteUsr_new (void)
Usr_GetParamOtherUsrCodEncryptedAndGetUsrData ();
/***** Unfav a social note previously marked as favourite *****/
Soc_UnfavSocialNote_new (&SocNot);
Soc_UnfavSocialNote (&SocNot);
/***** Write HTML inside DIV with form to fav *****/
Soc_PutFormToFavSocialNote_new (&SocNot);
@ -3602,7 +3579,7 @@ void Soc_UnfavSocialNoteUsr_new (void)
Gbl.Layout.DivsEndWritten = Gbl.Layout.HTMLEndWritten = true;
}
static void Soc_UnfavSocialNote_new (struct SocialNote *SocNot)
static void Soc_UnfavSocialNote (struct SocialNote *SocNot)
{
long OriginalPubCod;
bool ItsMe;

10
swad_social.h
View File

@ -157,17 +157,15 @@ void Soc_ReceiveCommentUsr (void);
void Soc_ShareSocialNoteGbl (void);
void Soc_ShareSocialNoteUsr (void);
void Soc_FavSocialNoteGbl_new (void);
void Soc_FavSocialNoteUsr_new (void);
// void Soc_FavSocialNoteUsr (void);
void Soc_FavSocialNoteGbl (void);
void Soc_FavSocialNoteUsr (void);
void Soc_FavSocialCommentGbl (void);
void Soc_FavSocialCommentUsr (void);
void Soc_UnshareSocialNoteGbl (void);
void Soc_UnshareSocialNoteUsr (void);
void Soc_UnfavSocialNoteGbl_new (void);
void Soc_UnfavSocialNoteUsr_new (void);
// void Soc_UnfavSocialNoteUsr (void);
void Soc_UnfavSocialNoteGbl (void);
void Soc_UnfavSocialNoteUsr (void);
void Soc_UnfavSocialCommentGbl (void);
void Soc_UnfavSocialCommentUsr (void);