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 15.79.2

This commit is contained in:
Antonio Cañas Vargas 2015-12-29 14:57:38 +01:00
parent b5753b5268
commit 9929a4ebb7
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -115,13 +115,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.79.1 (2015-12-29)"
#define Log_PLATFORM_VERSION "SWAD 15.79.2 (2015-12-29)"
#define CSS_FILE "swad15.79.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.79.2: Dec 29, 2015 Include my public activity in timeline. (188838 lines)
Version 15.79.1: Dec 29, 2015 Changes in layout of user's profile. (188836 lines)
Version 15.79: Dec 29, 2015 Show timeline of a selected user.
Changes in CSS related to social activity. (188834 lines)

36
swad_social.c
View File

@ -141,24 +141,26 @@ void Soc_ShowFollowingTimeline (void)
{
char Query[512];
if (Fol_GetNumFollowing (Gbl.Usrs.Me.UsrDat.UsrCod)) // I follow people
{
/***** Build query to show timeline including the users I am following *****/
sprintf (Query,"SELECT SocialEvent,UsrCod,"
"CtyCod,InsCod,CtrCod,DegCod,CrsCod,"
"Cod,UNIX_TIMESTAMP(TimeEvent)"
" FROM social,usr_follow"
" WHERE usr_follow.FollowerCod='%ld'"
" AND usr_follow.FollowedCod=social.UsrCod"
" ORDER BY SocCod DESC LIMIT 10",
Gbl.Usrs.Me.UsrDat.UsrCod);
/***** Show timeline *****/
if (!Soc_ShowTimeline (Query))
Lay_ShowAlert (Lay_INFO,"No hay actividad pública de los usuarios a los que sigue."); // Need translation!!!
}
else // I do not follow people
/***** Show warning if I do not follow anyone *****/
if (!Fol_GetNumFollowing (Gbl.Usrs.Me.UsrDat.UsrCod))
Lay_ShowAlert (Lay_INFO,"Usted no sigue a ningún usuario."); // Need translation!!!
/***** Build query to show timeline including the users I am following *****/
sprintf (Query,"SELECT SocialEvent,UsrCod,"
"CtyCod,InsCod,CtrCod,DegCod,CrsCod,"
"Cod,UNIX_TIMESTAMP(TimeEvent)"
" FROM social"
" WHERE UsrCod IN"
" (SELECT '%ld'"
" UNION"
" SELECT FollowedCod FROM usr_follow WHERE FollowerCod='%ld')"
" ORDER BY SocCod DESC LIMIT 10",
Gbl.Usrs.Me.UsrDat.UsrCod,
Gbl.Usrs.Me.UsrDat.UsrCod);
/***** Show timeline *****/
if (!Soc_ShowTimeline (Query))
Lay_ShowAlert (Lay_INFO,"No hay actividad pública."); // Need translation!!!
}
/*****************************************************************************/