diff --git a/swad_changelog.h b/swad_changelog.h
index 4aced666..5c992fe4 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -214,13 +214,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
-#define Log_PLATFORM_VERSION "SWAD 16.184 (2017-04-18)"
+#define Log_PLATFORM_VERSION "SWAD 16.185 (2017-04-19)"
#define CSS_FILE "swad16.184.css"
#define JS_FILE "swad16.181.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 16.185: Apr 19, 2017 Code refactoring in forums. (217708 lines)
Version 16.184: Apr 18, 2017 Changes in layout of page numbers. (217724 lines)
Version 16.183.1: Apr 18, 2017 Changes in layout of forums. (217719 lines)
Version 16.183: Apr 18, 2017 Code refactoring in forums. (217738 lines)
diff --git a/swad_forum.c b/swad_forum.c
index 0d7f2489..2dd86f91 100644
--- a/swad_forum.c
+++ b/swad_forum.c
@@ -281,7 +281,7 @@ static long For_InsertForumPst (long ThrCod,long UsrCod,
static bool For_RemoveForumPst (long PstCod,struct Image *Image);
static unsigned For_NumPstsInThrWithPstCod (long PstCod,long *ThrCod);
-static long For_InsertForumThread (struct Forum *WichForum,long FirstPstCod);
+static long For_InsertForumThread (long FirstPstCod);
static void For_RemoveThreadOnly (long ThrCod);
static void For_RemoveThreadAndItsPsts (long ThrCod);
static void For_GetThrSubject (long ThrCod,char Subject[Cns_MAX_BYTES_SUBJECT + 1]);
@@ -290,7 +290,8 @@ static void For_UpdateThrFirstAndLastPst (long ThrCod,long FirstPstCod,long Last
static void For_UpdateThrLastPst (long ThrCod,long LastPstCod);
static long For_GetLastPstCod (long ThrCod);
-static void For_UpdateThrReadTime (long ThrCod,time_t ReadTimeUTC);
+static void For_UpdateThrReadTime (long ThrCod,
+ time_t CreatTimeUTCOfTheMostRecentPostRead);
static unsigned For_GetNumOfReadersOfThr (long ThrCod);
static unsigned For_GetNumOfWritersInThr (long ThrCod);
static unsigned For_GetNumPstsInThr (long ThrCod);
@@ -300,15 +301,14 @@ static void For_DeleteThrFromReadThrs (long ThrCod);
static void For_ShowPostsOfAThread (Lay_AlertType_t AlertType,const char *Message);
static void For_PutIconNewPost (void);
-static void For_ShowAForumPost (struct Forum *ForumSelected,
- unsigned PstNum,long PstCod,
+static void For_ShowAForumPost (unsigned PstNum,long PstCod,
bool LastPst,char LastSubject[Cns_MAX_BYTES_SUBJECT + 1],
bool NewPst,bool ICanModerateForum);
static void For_GetPstData (long PstCod,long *UsrCod,time_t *CreatTimeUTC,
char Subject[Cns_MAX_BYTES_SUBJECT + 1],
char Content[Cns_MAX_BYTES_LONG_TEXT + 1],
struct Image *Image);
-static void For_WriteNumberOfPosts (struct Forum *ForumSelected,long UsrCod);
+static void For_WriteNumberOfPosts (long UsrCod);
static void For_PutAllHiddenParamsSelectedForum (void);
static void For_PutParamForumSet (For_ForumSet_t ForumSet);
@@ -332,18 +332,13 @@ static long For_WriteLinksToDegForums (long DegCod,bool IsLastDeg,
bool IsLastItemInLevel[1 + For_FORUM_MAX_LEVELS]);
static long For_WriteLinksToCrsForums (long CrsCod,bool IsLastCrs,
bool IsLastItemInLevel[1 + For_FORUM_MAX_LEVELS]);
-static void For_WriteLinkToAForum (struct Forum *Forum,
- bool Highlight,bool ShowNumOfPosts,
- unsigned Level,
- bool IsLastItemInLevel[1 + For_FORUM_MAX_LEVELS]);
static void For_WriteLinkToForum (struct Forum *Forum,
- Act_Action_t NextAct,
- const char *Icon,const char *ForumName,
bool Highlight,bool ShowNumOfPosts,
- unsigned Level,bool IsLastItemInLevel[1 + For_FORUM_MAX_LEVELS]);
-static unsigned For_GetNumThrsWithNewPstsInForum (struct Forum *ForumSelected,
+ unsigned Level,
+ bool IsLastItemInLevel[1 + For_FORUM_MAX_LEVELS]);
+static unsigned For_GetNumThrsWithNewPstsInForum (struct Forum *Forum,
unsigned NumThreads);
-static unsigned For_GetNumOfThreadsInForumNewerThan (struct Forum *ForumSelected,
+static unsigned For_GetNumOfThreadsInForumNewerThan (struct Forum *Forum,
const char *Time);
static unsigned For_GetNumOfUnreadPostsInThr (long ThrCod,unsigned NumPostsInThr);
static unsigned For_GetNumOfPostsInThrNewerThan (long ThrCod,const char *Time);
@@ -353,8 +348,8 @@ static void For_WriteNumberOfThrs (unsigned NumThrs,unsigned NumThrsWithNewPosts
static void For_ShowForumThreadsHighlightingOneThread (long ThrCodHighlighted,
Lay_AlertType_t AlertType,const char *Message);
static void For_PutIconNewThread (void);
-static unsigned For_GetNumThrsInForum (struct Forum *ForumSelected);
-static unsigned For_GetNumPstsInForum (struct Forum *ForumSelected);
+static unsigned For_GetNumThrsInForum (struct Forum *Forum);
+static unsigned For_GetNumPstsInForum (struct Forum *Forum);
static void For_ListForumThrs (long ThrCods[Pag_ITEMS_PER_PAGE],
long ThrCodHighlighted,
struct Pagination *PaginationThrs);
@@ -370,7 +365,7 @@ static void For_UpdateNumUsrsNotifiedByEMailAboutPost (long PstCod,unsigned NumU
static bool For_CheckIfICanMoveThreads (void);
static long For_GetThrInMyClipboard (void);
-static bool For_CheckIfThrBelongsToForum (long ThrCod,struct Forum *ForumSelected);
+static bool For_CheckIfThrBelongsToForum (long ThrCod,struct Forum *Forum);
static void For_MoveThrToCurrentForum (long ThrCod);
static void For_InsertThrInClipboard (long ThrCod);
static void For_RemoveExpiredThrsClipboards (void);
@@ -613,7 +608,7 @@ static unsigned For_NumPstsInThrWithPstCod (long PstCod,long *ThrCod)
/*****************************************************************************/
// Returns the code of the new inserted thread
-static long For_InsertForumThread (struct Forum *WichForum,long FirstPstCod)
+static long For_InsertForumThread (long FirstPstCod)
{
char Query[512];
@@ -622,7 +617,8 @@ static long For_InsertForumThread (struct Forum *WichForum,long FirstPstCod)
" (ForumType,Location,FirstPstCod,LastPstCod)"
" VALUES"
" (%u,%ld,%ld,%ld)",
- (unsigned) WichForum->Type,WichForum->Location,
+ (unsigned) Gbl.Forum.ForumSelected.Type,
+ Gbl.Forum.ForumSelected.Location,
FirstPstCod,FirstPstCod);
return DB_QueryINSERTandReturnCode (Query,"can not create a new thread in a forum");
}
@@ -702,7 +698,7 @@ static void For_GetThrSubject (long ThrCod,char Subject[Cns_MAX_BYTES_SUBJECT +
/*************** Get the forum type and location of a post *******************/
/*****************************************************************************/
-void For_GetForumTypeAndLocationOfAPost (long PstCod,struct Forum *ForumSelected)
+void For_GetForumTypeAndLocationOfAPost (long PstCod,struct Forum *Forum)
{
char Query[512];
MYSQL_RES *mysql_res;
@@ -711,8 +707,8 @@ void For_GetForumTypeAndLocationOfAPost (long PstCod,struct Forum *ForumSelected
long LongNum;
/***** Set default forum type and location *****/
- ForumSelected->Type = For_FORUM_UNKNOWN;
- ForumSelected->Location = -1L;
+ Forum->Type = For_FORUM_UNKNOWN;
+ Forum->Location = -1L;
/***** Get forum type of a forum from database *****/
sprintf (Query,"SELECT forum_thread.ForumType,forum_thread.Location"
@@ -729,11 +725,11 @@ void For_GetForumTypeAndLocationOfAPost (long PstCod,struct Forum *ForumSelected
/* Get forum type (row[0]) */
if (sscanf (row[0],"%u",&UnsignedNum) == 1)
if (UnsignedNum < For_NUM_TYPES_FORUM)
- ForumSelected->Type = (For_ForumType_t) UnsignedNum;
+ Forum->Type = (For_ForumType_t) UnsignedNum;
/* Get forum location (row[1]) */
if (sscanf (row[1],"%ld",&LongNum) == 1)
- ForumSelected->Location = LongNum;
+ Forum->Location = LongNum;
}
/***** Free structure that stores the query result *****/
@@ -800,8 +796,11 @@ static long For_GetLastPstCod (long ThrCod)
// Update forum_thr_read table indicating that this thread page and previous ones
// have been read and have no new posts for the current user
// (even if any previous pages have been no read actually)
+// Note that database is not updated with the current time,
+// but with the creation time of the most recent post in this thread read by me.
-static void For_UpdateThrReadTime (long ThrCod,time_t ReadTimeUTC)
+static void For_UpdateThrReadTime (long ThrCod,
+ time_t CreatTimeUTCOfTheMostRecentPostRead)
{
char Query[256];
@@ -810,7 +809,8 @@ static void For_UpdateThrReadTime (long ThrCod,time_t ReadTimeUTC)
" (ThrCod,UsrCod,ReadTime)"
" VALUES"
" (%ld,%ld,FROM_UNIXTIME(%ld))",
- ThrCod,Gbl.Usrs.Me.UsrDat.UsrCod,(long) ReadTimeUTC);
+ ThrCod,Gbl.Usrs.Me.UsrDat.UsrCod,
+ (long) CreatTimeUTCOfTheMostRecentPostRead);
DB_QueryREPLACE (Query,"can not update the status of reading of a thread of a forum");
}
@@ -1083,12 +1083,15 @@ static void For_ShowPostsOfAThread (Lay_AlertType_t AlertType,const char *Messag
if (NewPst && NumRow == PaginationPsts.LastItemVisible)
/* Update forum_thr_read table indicating that this thread page and previous ones
have been read and have no new posts for the current user
- (even if any previous pages have been no read actually) */
- For_UpdateThrReadTime (Gbl.Forum.ForumSelected.ThrCod,CreatTimeUTC);
+ (even if any previous pages have been no read actually).
+ Note that database is not updated with the current time,
+ but with the creation time of the most recent post
+ in this page of threads. */
+ For_UpdateThrReadTime (Gbl.Forum.ForumSelected.ThrCod,
+ CreatTimeUTC);
/* Show post */
- For_ShowAForumPost (&Gbl.Forum.ForumSelected,
- NumPst,PstCod,
+ For_ShowAForumPost (NumPst,PstCod,
(NumRow == NumRows),LastSubject,
NewPst,ICanModerateForum);
@@ -1152,8 +1155,7 @@ static void For_PutIconNewPost (void)
/**************************** Show a post from forum *************************/
/*****************************************************************************/
-static void For_ShowAForumPost (struct Forum *ForumSelected,
- unsigned PstNum,long PstCod,
+static void For_ShowAForumPost (unsigned PstNum,long PstCod,
bool LastPst,char LastSubject[Cns_MAX_BYTES_SUBJECT + 1],
bool NewPst,bool ICanModerateForum)
{
@@ -1237,8 +1239,8 @@ static void For_ShowAForumPost (struct Forum *ForumSelected,
"
");
if (ICanModerateForum)
{
- Act_FormStartAnchor (Enabled ? For_ActionsDisPstFor[ForumSelected->Type] :
- For_ActionsEnbPstFor[ForumSelected->Type],
+ Act_FormStartAnchor (Enabled ? For_ActionsDisPstFor[Gbl.Forum.ForumSelected.Type] :
+ For_ActionsEnbPstFor[Gbl.Forum.ForumSelected.Type],
For_ID_FORUM_POSTS_SECTION);
For_PutAllHiddenParamsForum (Gbl.Forum.CurrentPageThrs, // Page of threads = current
Gbl.Forum.CurrentPagePsts, // Page of posts = current
@@ -1284,10 +1286,10 @@ static void For_ShowAForumPost (struct Forum *ForumSelected,
// Post can be removed if post is the last (without answers) and it's mine
{
if (PstNum == 1) // First and unique post in thread
- Act_FormStartAnchor (For_ActionsDelPstFor[ForumSelected->Type],
+ Act_FormStartAnchor (For_ActionsDelPstFor[Gbl.Forum.ForumSelected.Type],
For_ID_FORUM_THREADS_SECTION);
else // Last of several posts in thread
- Act_FormStartAnchor (For_ActionsDelPstFor[ForumSelected->Type],
+ Act_FormStartAnchor (For_ActionsDelPstFor[Gbl.Forum.ForumSelected.Type],
For_ID_FORUM_POSTS_SECTION);
For_PutAllHiddenParamsForum (Gbl.Forum.CurrentPageThrs, // Page of threads = current
Gbl.Forum.CurrentPagePsts, // Page of posts = current
@@ -1313,7 +1315,7 @@ static void For_ShowAForumPost (struct Forum *ForumSelected,
{
/* Write number of posts from this user */
fprintf (Gbl.F.Out,"
![\"%s\"](\"%s/paste_off16x16.gif\"" "\\"%s\\"\"")
",
+ Gbl.Prefs.IconsURL,
+ Txt_Copy_not_allowed,Txt_Copy_not_allowed);
+ else
+ {
+ Act_FormStartAnchor (For_ActionsPasThrFor[Forum->Type],
+ For_ID_FORUM_THREADS_SECTION);
+ For_PutAllHiddenParamsForum (1, // Page of threads = first
+ 1, // Page of posts = first
+ Gbl.Forum.ForumSet,
+ Gbl.Forum.ThreadsOrder,
+ Forum->Location,
+ Gbl.Forum.ThreadToMove,
+ -1L);
+ fprintf (Gbl.F.Out,"",
+ Gbl.Prefs.IconsURL,
+ Txt_Paste_thread,
+ Txt_Paste_thread);
+ Act_FormEnd ();
+ }
+ }
+
+ /***** Write link to forum *****/
+ Act_FormStartAnchor (For_ActionsSeeFor[Forum->Type],
+ For_ID_FORUM_THREADS_SECTION);
+ For_PutAllHiddenParamsForum (1, // Page of threads = first
+ 1, // Page of posts = first
+ Gbl.Forum.ForumSet,
+ Gbl.Forum.ThreadsOrder,
+ Forum->Location,
+ -1L,
+ -1L);
+ Act_LinkFormSubmit (Act_GetActionTextFromDB (Act_Actions[For_ActionsSeeFor[Forum->Type]].ActCod,ActTxt),
+ Style,NULL);
+ For_SetForumName (Forum,ForumName,Gbl.Prefs.Language,true);
switch (Forum->Type)
{
case For_FORUM_GLOBAL_USRS:
case For_FORUM_GLOBAL_TCHS:
- sprintf (Icon,"![\"%s\"](\"%s/forum64x64.gif\"" "\\"%s\\"\"")
",
- Gbl.Prefs.IconsURL,
- ForumName,ForumName);
+ fprintf (Gbl.F.Out,"![\"%s\"](\"%s/swad64x64.gif\"" "\\"%s\\"\"")
",
- Gbl.Prefs.IconsURL,
- ForumName,ForumName);
+ fprintf (Gbl.F.Out,"![\"%s\"](\"%s/dot64x64.png\"" "\\"%s\\"\"")
",
- Gbl.Prefs.IconsURL,
- ForumName,ForumName);
+ fprintf (Gbl.F.Out,"