"
"");
+ if (ICanModerateForum)
+ {
+ Act_FormStartAnchor (Enabled ? For_ActionsDisPstFor[ForumSelected->Type] :
+ For_ActionsEnbPstFor[ForumSelected->Type],
+ For_ID_FORUM_POSTS_SECTION);
+ For_PutAllHiddenParamsForum (Gbl.Forum.CurrentPageThrs, // Page of threads = current
+ Gbl.Forum.CurrentPagePsts, // Page of posts = current
+ Gbl.Forum.ForumSet,
+ Gbl.Forum.ThreadsOrder,
+ Gbl.Forum.ForumSelected.Location,
+ Gbl.Forum.ForumSelected.ThrCod,
+ PstCod);
+
+ sprintf (Gbl.Title,Enabled ? Txt_Post_X_allowed_Click_to_ban_it :
+ Txt_Post_X_banned_Click_to_unban_it,
+ PstNum);
+ fprintf (Gbl.F.Out,"",
+ Gbl.Prefs.IconsURL,
+ Enabled ? "eye" :
+ "eye-slash",
+ Gbl.Title,
+ Gbl.Title);
+ Act_FormEnd ();
+ }
+ else
+ {
+ sprintf (Gbl.Title,Enabled ? Txt_Post_X_allowed :
+ Txt_Post_X_banned,
+ PstNum);
+ fprintf (Gbl.F.Out,""
+ "![\"%s\"](\"%s/%s-off64x64.png\"" "\\"%s\\"\"") "
+ "",
+ Gbl.Title,
+ Gbl.Prefs.IconsURL,
+ Enabled ? "eye" :
+ "eye-slash",
+ Gbl.Title,
+ Gbl.Title);
+ }
+
+ /***** Form to remove post *****/
if (LastPst && Gbl.Usrs.Me.UsrDat.UsrCod == UsrDat.UsrCod)
// 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],
For_ID_FORUM_THREADS_SECTION);
- Pag_PutHiddenParamPagNum (Pag_THREADS_FORUM,
- Gbl.Forum.CurrentPageThrs);
- }
else // Last of several posts in thread
- {
Act_FormStartAnchor (For_ActionsDelPstFor[ForumSelected->Type],
For_ID_FORUM_POSTS_SECTION);
- Pag_PutHiddenParamPagNum (Pag_POSTS_FORUM,
- Gbl.Forum.CurrentPagePsts);
- }
- For_PutAllHiddenParamsForum (Gbl.Forum.ForumSet,
+ For_PutAllHiddenParamsForum (Gbl.Forum.CurrentPageThrs, // Page of threads = current
+ Gbl.Forum.CurrentPagePsts, // Page of posts = current
+ Gbl.Forum.ForumSet,
Gbl.Forum.ThreadsOrder,
Gbl.Forum.ForumSelected.Location,
Gbl.Forum.ForumSelected.ThrCod,
@@ -1254,62 +1293,13 @@ static void For_ShowAForumPost (struct Forum *ForumSelected,
Lay_PutIconRemove ();
Act_FormEnd ();
}
+ fprintf (Gbl.F.Out," | ");
- /***** Form to ban/unban post *****/
- else
- {
- if (ICanModerateForum)
- {
- Act_FormStartAnchor (Enabled ? For_ActionsDisPstFor[ForumSelected->Type] :
- For_ActionsEnbPstFor[ForumSelected->Type],
- For_ID_FORUM_POSTS_SECTION);
- Pag_PutHiddenParamPagNum (Pag_POSTS_FORUM,Gbl.Forum.CurrentPagePsts);
- For_PutAllHiddenParamsForum (Gbl.Forum.ForumSet,
- Gbl.Forum.ThreadsOrder,
- Gbl.Forum.ForumSelected.Location,
- Gbl.Forum.ForumSelected.ThrCod,
- PstCod);
-
- sprintf (Gbl.Title,Enabled ? Txt_Post_X_allowed_Click_to_ban_it :
- Txt_Post_X_banned_Click_to_unban_it,
- PstNum);
- fprintf (Gbl.F.Out,"",
- Gbl.Prefs.IconsURL,
- Enabled ? "eye" :
- "eye-slash",
- Gbl.Title,
- Gbl.Title);
- Act_FormEnd ();
- }
- else
- {
- sprintf (Gbl.Title,Enabled ? Txt_Post_X_allowed :
- Txt_Post_X_banned,
- PstNum);
- fprintf (Gbl.F.Out,""
- ""
- "",
- Gbl.Title,
- Gbl.Prefs.IconsURL,
- Enabled ? "eye" :
- "eye-slash",
- Gbl.Title,
- Gbl.Title);
- }
- }
-
- /***** Write author or destinatary, and form to reply (in case of received post) *****/
- fprintf (Gbl.F.Out,""
- ""
- "");
-
- /* Write author */
- fprintf (Gbl.F.Out,"");
+ ""
+ "");
Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat);
Msg_WriteMsgAuthor (&UsrDat,"AUTHOR_TXT",Enabled,NULL);
fprintf (Gbl.F.Out," ");
@@ -1320,11 +1310,11 @@ static void For_ShowAForumPost (struct Forum *ForumSelected,
For_WriteNumberOfPosts (ForumSelected,UsrDat.UsrCod);
fprintf (Gbl.F.Out,"");
}
+ fprintf (Gbl.F.Out," "
+ "");
/***** Write post content *****/
- fprintf (Gbl.F.Out," "
- " | "
- "");
+ fprintf (Gbl.F.Out," | ");
if (Enabled)
{
Str_Copy (Content,OriginalContent,
@@ -1498,19 +1488,25 @@ static void For_WriteNumberOfPosts (struct Forum *ForumSelected,long UsrCod)
static void For_PutAllHiddenParamsSelectedForum (void)
{
- For_PutAllHiddenParamsForum (Gbl.Forum.ForumSet,
+ For_PutAllHiddenParamsForum (Gbl.Forum.CurrentPageThrs, // Page of threads = current
+ Gbl.Forum.CurrentPagePsts, // Page of posts = current
+ Gbl.Forum.ForumSet,
Gbl.Forum.ThreadsOrder,
Gbl.Forum.ForumSelected.Location,
Gbl.Forum.ForumSelected.ThrCod,
-1L);
}
-void For_PutAllHiddenParamsForum (For_ForumSet_t ForumSet,
+void For_PutAllHiddenParamsForum (unsigned NumPageThreads,
+ unsigned NumPagePosts,
+ For_ForumSet_t ForumSet,
For_Order_t Order,
long Location,
long ThrCod,
long PstCod)
{
+ Pag_PutHiddenParamPagNum (Pag_THREADS_FORUM,NumPageThreads);
+ Pag_PutHiddenParamPagNum (Pag_POSTS_FORUM,NumPagePosts);
For_PutParamForumSet (ForumSet);
For_PutParamForumOrder (Order);
For_PutParamForumLocation (Location);
@@ -2236,8 +2232,9 @@ static void For_WriteLinkToForum (struct Forum *Forum,
else
{
Act_FormStart (For_ActionsPasThrFor[Forum->Type]);
- Pag_PutHiddenParamPagNum (Pag_THREADS_FORUM,Gbl.Forum.CurrentPageThrs);
- For_PutAllHiddenParamsForum (Gbl.Forum.ForumSet,
+ For_PutAllHiddenParamsForum (1, // Page of threads = first
+ 1, // Page of posts = first
+ Gbl.Forum.ForumSet,
Gbl.Forum.ThreadsOrder,
Gbl.Forum.ForumSelected.Location,
Gbl.Forum.ThreadToMove,
@@ -2254,7 +2251,9 @@ static void For_WriteLinkToForum (struct Forum *Forum,
/***** Write link to forum *****/
Act_FormStartAnchor (NextAct,For_ID_FORUM_THREADS_SECTION);
- For_PutAllHiddenParamsForum (Gbl.Forum.ForumSet,
+ For_PutAllHiddenParamsForum (1, // Page of threads = first
+ 1, // Page of posts = first
+ Gbl.Forum.ForumSet,
Gbl.Forum.ThreadsOrder,
Forum->Location,
-1L,
@@ -2466,7 +2465,7 @@ static void For_WriteNumberOfThrs (unsigned NumThrs,unsigned NumThrsWithNewPosts
/********************** Show available threads of a forum ********************/
/*****************************************************************************/
-void For_ShowForumThrs (void)
+void For_ShowForumTheads (void)
{
/***** Get parameters related to forum *****/
For_GetParamsForum ();
@@ -2601,8 +2600,9 @@ static void For_ShowForumThreadsHighlightingOneThread (long ThrCodHighlighted,
fprintf (Gbl.F.Out," | ");
Act_FormStartAnchor (For_ActionsSeeFor[Gbl.Forum.ForumSelected.Type],
For_ID_FORUM_THREADS_SECTION);
- Pag_PutHiddenParamPagNum (Pag_THREADS_FORUM,PaginationThrs.CurrentPage);
- For_PutAllHiddenParamsForum (Gbl.Forum.ForumSet,
+ For_PutAllHiddenParamsForum (Gbl.Forum.CurrentPageThrs, // Page of threads = current
+ 1, // Page of posts = first
+ Gbl.Forum.ForumSet,
Order,
Gbl.Forum.ForumSelected.Location,
-1L,
@@ -3331,8 +3331,9 @@ static void For_ListForumThrs (long ThrCods[Pag_ITEMS_PER_PAGE],
fprintf (Gbl.F.Out,"
");
Act_FormStartAnchor (For_ActionsReqDelThr[Gbl.Forum.ForumSelected.Type],
For_ID_REMOVE_THREAD_SECTION);
- Pag_PutHiddenParamPagNum (Pag_THREADS_FORUM,Gbl.Forum.CurrentPageThrs);
- For_PutAllHiddenParamsForum (Gbl.Forum.ForumSet,
+ For_PutAllHiddenParamsForum (Gbl.Forum.CurrentPageThrs, // Page of threads = current
+ 1, // Page of posts = first
+ Gbl.Forum.ForumSet,
Gbl.Forum.ThreadsOrder,
Gbl.Forum.ForumSelected.Location,
Thr.ThrCod,
@@ -3347,8 +3348,9 @@ static void For_ListForumThrs (long ThrCods[Pag_ITEMS_PER_PAGE],
fprintf (Gbl.F.Out,"
");
Act_FormStartAnchor (For_ActionsCutThrFor[Gbl.Forum.ForumSelected.Type],
For_ID_FORUM_THREADS_SECTION);
- Pag_PutHiddenParamPagNum (Pag_THREADS_FORUM,Gbl.Forum.CurrentPageThrs);
- For_PutAllHiddenParamsForum (Gbl.Forum.ForumSet,
+ For_PutAllHiddenParamsForum (Gbl.Forum.CurrentPageThrs, // Page of threads = current
+ 1, // Page of posts = first
+ Gbl.Forum.ForumSet,
Gbl.Forum.ThreadsOrder,
Gbl.Forum.ForumSelected.Location,
Thr.ThrCod,
@@ -3539,7 +3541,7 @@ static void For_GetThrData (struct ForumThread *Thr)
/**************** Show posts of a thread in a discussion forum ***************/
/*****************************************************************************/
-void For_ShowThrPsts (void)
+void For_ShowThreadPosts (void)
{
/***** Get parameters related to forum *****/
For_GetParamsForum ();
@@ -3552,7 +3554,7 @@ void For_ShowThrPsts (void)
Lay_SUCCESS,NULL);
/***** Show the posts of that thread *****/
- For_ShowThreadPosts (Lay_SUCCESS,NULL);
+ For_ShowPostsOfAThread (Lay_SUCCESS,NULL);
}
/*****************************************************************************/
@@ -3801,8 +3803,9 @@ static void For_WriteFormForumPst (bool IsReply,const char *Subject)
{
Act_FormStartAnchor (For_ActionsRecRepFor[Gbl.Forum.ForumSelected.Type],
For_ID_FORUM_POSTS_SECTION);
- Pag_PutHiddenParamPagNum (Pag_POSTS_FORUM,Gbl.Forum.CurrentPagePsts);
- For_PutAllHiddenParamsForum (Gbl.Forum.ForumSet,
+ For_PutAllHiddenParamsForum (Gbl.Forum.CurrentPageThrs, // Page of threads = current
+ UINT_MAX, // Page of posts = last
+ Gbl.Forum.ForumSet,
Gbl.Forum.ThreadsOrder,
Gbl.Forum.ForumSelected.Location,
Gbl.Forum.ForumSelected.ThrCod,
@@ -3812,7 +3815,9 @@ static void For_WriteFormForumPst (bool IsReply,const char *Subject)
{
Act_FormStartAnchor (For_ActionsRecThrFor[Gbl.Forum.ForumSelected.Type],
For_ID_FORUM_POSTS_SECTION);
- For_PutAllHiddenParamsForum (Gbl.Forum.ForumSet,
+ For_PutAllHiddenParamsForum (1, // Page of threads = first
+ 1, // Page of posts = first
+ Gbl.Forum.ForumSet,
Gbl.Forum.ThreadsOrder,
Gbl.Forum.ForumSelected.Location,
-1L,
@@ -3825,20 +3830,20 @@ static void For_WriteFormForumPst (bool IsReply,const char *Subject)
/* Subject */
fprintf (Gbl.F.Out," |
"
@@ -3876,10 +3881,10 @@ static void For_WriteFormForumPst (bool IsReply,const char *Subject)
/************************** Receive message of a forum ***********************/
/*****************************************************************************/
-void For_RecForumPst (void)
+void For_ReceiveForumPost (void)
{
extern const char *Txt_Post_sent;
- bool PstIsAReply = false;
+ bool IsReply = false;
long PstCod = 0;
unsigned NumUsrsToBeNotifiedByEMail;
struct SocialPublishing SocPub;
@@ -3896,7 +3901,7 @@ void For_RecForumPst (void)
Gbl.Action.Act == ActRcvRepForInsUsr || Gbl.Action.Act == ActRcvRepForInsTch ||
Gbl.Action.Act == ActRcvRepForGenUsr || Gbl.Action.Act == ActRcvRepForGenTch ||
Gbl.Action.Act == ActRcvRepForSWAUsr || Gbl.Action.Act == ActRcvRepForSWATch)
- PstIsAReply = true;
+ IsReply = true;
/***** Get message subject *****/
Par_GetParToHTML ("Subject",Gbl.Msg.Subject,Cns_MAX_BYTES_SUBJECT);
@@ -3915,7 +3920,7 @@ void For_RecForumPst (void)
Img_GetImageFromForm (-1,&Image,NULL);
/***** Create a new message *****/
- if (PstIsAReply) // This post is a reply to another posts in the thread
+ if (IsReply) // This post is a reply to another posts in the thread
{
// Gbl.Forum.ForumSelected.ThrCod has been received from form
@@ -3952,19 +3957,15 @@ void For_RecForumPst (void)
case For_FORUM_COURSE_TCHS:
if ((NumUsrsToBeNotifiedByEMail = Ntf_StoreNotifyEventsToAllUsrs (Ntf_EVENT_FORUM_POST_COURSE,PstCod)))
For_UpdateNumUsrsNotifiedByEMailAboutPost (PstCod,NumUsrsToBeNotifiedByEMail);
- // Ntf_ShowAlertNumUsrsToBeNotifiedByEMail (NumUsrsToBeNotifiedByEMail);
break;
default:
break;
}
/***** Notify the new post to previous writers in this thread *****/
- if (PstIsAReply)
- {
+ if (IsReply)
if ((NumUsrsToBeNotifiedByEMail = Ntf_StoreNotifyEventsToAllUsrs (Ntf_EVENT_FORUM_REPLY,PstCod)))
For_UpdateNumUsrsNotifiedByEMailAboutPost (PstCod,NumUsrsToBeNotifiedByEMail);
- // Ntf_ShowAlertNumUsrsToBeNotifiedByEMail (NumUsrsToBeNotifiedByEMail);
- }
/***** Insert forum post into public social activity *****/
switch (Gbl.Forum.ForumSelected.Type) // Only if forum is public for any logged user
@@ -3985,7 +3986,7 @@ void For_RecForumPst (void)
Lay_SUCCESS,NULL);
/***** Show again the posts of this thread of the forum *****/
- For_ShowThreadPosts (Lay_SUCCESS,Txt_Post_sent);
+ For_ShowPostsOfAThread (Lay_SUCCESS,Txt_Post_sent);
}
/*****************************************************************************/
@@ -4007,7 +4008,7 @@ static void For_UpdateNumUsrsNotifiedByEMailAboutPost (long PstCod,unsigned NumU
/***************************** Delete a forum post ***************************/
/*****************************************************************************/
-void For_DelPst (void)
+void For_RemovePost (void)
{
extern const char *Txt_Post_and_thread_removed;
extern const char *Txt_Post_removed;
@@ -4075,7 +4076,7 @@ void For_DelPst (void)
For_ShowForumThreadsHighlightingOneThread (Gbl.Forum.ForumSelected.ThrCod,
Lay_SUCCESS,NULL);
/***** Show the remaining posts *****/
- For_ShowThreadPosts (Lay_SUCCESS,Txt_Post_removed);
+ For_ShowPostsOfAThread (Lay_SUCCESS,Txt_Post_removed);
}
}
@@ -4083,7 +4084,7 @@ void For_DelPst (void)
/***************** Request the removing of an existing thread ****************/
/*****************************************************************************/
-void For_ReqDelThr (void)
+void For_RequestRemoveThread (void)
{
extern const char *Txt_Do_you_really_want_to_remove_the_entire_thread_X;
extern const char *Txt_Do_you_really_want_to_remove_the_entire_thread;
@@ -4111,8 +4112,9 @@ void For_ReqDelThr (void)
Lay_ShowAlert (Lay_WARNING,Txt_Do_you_really_want_to_remove_the_entire_thread);
Act_FormStartAnchor (For_ActionsDelThrFor[Gbl.Forum.ForumSelected.Type],
For_ID_FORUM_THREADS_SECTION);
- Pag_PutHiddenParamPagNum (Pag_THREADS_FORUM,Gbl.Forum.CurrentPageThrs);
- For_PutAllHiddenParamsForum (Gbl.Forum.ForumSet,
+ For_PutAllHiddenParamsForum (Gbl.Forum.CurrentPageThrs, // Page of threads = current
+ 1, // Page of posts = first
+ Gbl.Forum.ForumSet,
Gbl.Forum.ThreadsOrder,
Gbl.Forum.ForumSelected.Location,
Gbl.Forum.ForumSelected.ThrCod,
@@ -4130,7 +4132,7 @@ void For_ReqDelThr (void)
/*************************** Remove an existing thread ***********************/
/*****************************************************************************/
-void For_DelThr (void)
+void For_RemoveThread (void)
{
extern const char *Txt_Thread_X_removed;
extern const char *Txt_Thread_removed;
@@ -4170,7 +4172,7 @@ void For_DelThr (void)
/*************** Cut a thread to move it to another forum ********************/
/*****************************************************************************/
-void For_CutThr (void)
+void For_CutThread (void)
{
extern const char *Txt_Thread_X_marked_to_be_moved;
extern const char *Txt_Thread_marked_to_be_moved;
@@ -4205,7 +4207,7 @@ void For_CutThr (void)
/************* Paste the thread in clipboard into current forum **************/
/*****************************************************************************/
-void For_PasteThr (void)
+void For_PasteThread (void)
{
extern const char *Txt_The_thread_X_is_already_in_this_forum;
extern const char *Txt_The_thread_is_already_in_this_forum;
diff --git a/swad_forum.h b/swad_forum.h
index 9cabf1e5d..ae8335b28 100644
--- a/swad_forum.h
+++ b/swad_forum.h
@@ -101,8 +101,8 @@ typedef enum
/***************************** Public prototypes *****************************/
/*****************************************************************************/
-void For_EnbPst (void);
-void For_DisPst (void);
+void For_EnablePost (void);
+void For_DisablePost (void);
void For_GetForumTypeAndLocationOfAPost (long PstCod,struct Forum *ForumSelected);
@@ -113,7 +113,9 @@ void For_GetSummaryAndContentForumPst (char SummaryStr[Ntf_MAX_BYTES_SUMMARY + 1
char **ContentStr,
long PstCod,bool GetContent);
-void For_PutAllHiddenParamsForum (For_ForumSet_t ForumSet,
+void For_PutAllHiddenParamsForum (unsigned NumPageThreads,
+ unsigned NumPagePosts,
+ For_ForumSet_t ForumSet,
For_Order_t Order,
long Location,
long ThrCod,
@@ -123,7 +125,7 @@ void For_SetForumName (struct Forum *ForumSelected,
char ForumName[For_MAX_BYTES_FORUM_NAME + 1],
Txt_Language_t Language,bool UseHTMLEntities);
-void For_ShowForumThrs (void);
+void For_ShowForumTheads (void);
unsigned For_GetNumTotalForumsOfType (For_ForumType_t ForumType,
long CtyCod,long InsCod,long CtrCod,long DegCod,long CrsCod);
unsigned For_GetNumTotalThrsInForumsOfType (For_ForumType_t ForumType,
@@ -132,13 +134,13 @@ unsigned For_GetNumTotalPstsInForumsOfType (For_ForumType_t ForumType,
long CtyCod,long InsCod,long CtrCod,long DegCod,long CrsCod,
unsigned *NumUsrsToBeNotifiedByEMail);
-void For_ShowThrPsts (void);
-void For_RecForumPst (void);
-void For_DelPst (void);
-void For_ReqDelThr (void);
-void For_DelThr (void);
-void For_CutThr (void);
-void For_PasteThr (void);
+void For_ShowThreadPosts (void);
+void For_ReceiveForumPost (void);
+void For_RemovePost (void);
+void For_RequestRemoveThread (void);
+void For_RemoveThread (void);
+void For_CutThread (void);
+void For_PasteThread (void);
void For_RemoveUsrFromThrClipboard (long UsrCod);
void For_RemoveForums (Sco_Scope_t Scope,long ForumLocation);
diff --git a/swad_notification.c b/swad_notification.c
index 7a02b050f..1907eb1d2 100644
--- a/swad_notification.c
+++ b/swad_notification.c
@@ -764,7 +764,9 @@ static bool Ntf_StartFormGoToAction (Ntf_NotifyEvent_t NotifyEvent,
case Ntf_EVENT_FORUM_POST_COURSE:
case Ntf_EVENT_FORUM_REPLY:
Act_FormStart (For_ActionsSeeFor[Gbl.Forum.ForumSelected.Type]);
- For_PutAllHiddenParamsForum (Gbl.Forum.ForumSet,
+ For_PutAllHiddenParamsForum (1, // Page of threads = first
+ 1, // Page of posts = first
+ Gbl.Forum.ForumSet,
Gbl.Forum.ThreadsOrder,
Gbl.Forum.ForumSelected.Location,
Gbl.Forum.ForumSelected.ThrCod,
diff --git a/swad_pagination.c b/swad_pagination.c
index 1be19cf45..a7f54c599 100644
--- a/swad_pagination.c
+++ b/swad_pagination.c
@@ -72,7 +72,10 @@ static const char *Pag_ParamNumPag[Pag_NUM_WHAT_PAGINATE] =
void Pag_CalculatePagination (struct Pagination *Pagination)
{
- Pagination->StartPage = Pagination->LeftPage = Pagination->RightPage = Pagination->EndPage = 1;
+ Pagination->StartPage =
+ Pagination->LeftPage =
+ Pagination->RightPage =
+ Pagination->EndPage = 1;
Pagination->MoreThanOnePage = false;
if ((Pagination->NumPags = NumSubsetsOfNElements (Pagination->NumItems,Pag_ITEMS_PER_PAGE)) > 1)
{
@@ -85,8 +88,10 @@ void Pag_CalculatePagination (struct Pagination *Pagination)
Pagination->CurrentPage = Pagination->NumPags;
/* Compute first page with link around the current */
- if ((Pagination->StartPage = Pagination->CurrentPage - NUM_PAGES_BEFORE_CURRENT) < 1)
+ if (Pagination->CurrentPage <= NUM_PAGES_BEFORE_CURRENT)
Pagination->StartPage = 1;
+ else
+ Pagination->StartPage = Pagination->CurrentPage - NUM_PAGES_BEFORE_CURRENT;
/* Compute last page with link around the current */
if ((Pagination->EndPage = Pagination->CurrentPage + NUM_PAGES_AFTER_CURRENT) > Pagination->NumPags)
@@ -138,7 +143,7 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,
extern const char *Txt_Page;
extern const char *Txt_See_page_X_of_Y;
extern const char *Txt_first_message_not_allowed;
- int NumPage;
+ unsigned NumPage;
/***** Link to page 1, including a text *****/
if (Subject)
@@ -162,8 +167,9 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,
case Pag_THREADS_FORUM:
Act_FormStartAnchor (For_ActionsSeeFor[Gbl.Forum.ForumSelected.Type],
Pagination->Anchor);
- Pag_PutHiddenParamPagNum (WhatPaginate,1);
- For_PutAllHiddenParamsForum (Gbl.Forum.ForumSet,
+ For_PutAllHiddenParamsForum (1, // Page of threads = first
+ 1, // Page of posts = first
+ Gbl.Forum.ForumSet,
Gbl.Forum.ThreadsOrder,
Gbl.Forum.ForumSelected.Location,
-1L,
@@ -172,8 +178,9 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,
case Pag_POSTS_FORUM:
Act_FormStartAnchor (For_ActionsSeePstFor[Gbl.Forum.ForumSelected.Type],
Pagination->Anchor);
- Pag_PutHiddenParamPagNum (WhatPaginate,1);
- For_PutAllHiddenParamsForum (Gbl.Forum.ForumSet,
+ For_PutAllHiddenParamsForum (Gbl.Forum.CurrentPageThrs, // Page of threads = current
+ 1, // Page of posts = first
+ Gbl.Forum.ForumSet,
Gbl.Forum.ThreadsOrder,
Gbl.Forum.ForumSelected.Location,
ThrCod,
@@ -211,7 +218,7 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,
break;
}
sprintf (Gbl.Title,Txt_See_page_X_of_Y,
- 1,(unsigned) Pagination->NumPags);
+ 1,Pagination->NumPags);
Act_LinkFormSubmit (Gbl.Title,Font,NULL);
}
else
@@ -262,8 +269,9 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,
case Pag_THREADS_FORUM:
Act_FormStartAnchor (For_ActionsSeeFor[Gbl.Forum.ForumSelected.Type],
Pagination->Anchor);
- Pag_PutHiddenParamPagNum (WhatPaginate,1);
- For_PutAllHiddenParamsForum (Gbl.Forum.ForumSet,
+ For_PutAllHiddenParamsForum (1, // Page of threads = first
+ 1, // Page of posts = first
+ Gbl.Forum.ForumSet,
Gbl.Forum.ThreadsOrder,
Gbl.Forum.ForumSelected.Location,
-1L,
@@ -272,8 +280,9 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,
case Pag_POSTS_FORUM:
Act_FormStartAnchor (For_ActionsSeePstFor[Gbl.Forum.ForumSelected.Type],
Pagination->Anchor);
- Pag_PutHiddenParamPagNum (WhatPaginate,1);
- For_PutAllHiddenParamsForum (Gbl.Forum.ForumSet,
+ For_PutAllHiddenParamsForum (Gbl.Forum.CurrentPageThrs, // Page of threads = current
+ 1, // Page of posts = first
+ Gbl.Forum.ForumSet,
Gbl.Forum.ThreadsOrder,
Gbl.Forum.ForumSelected.Location,
ThrCod,
@@ -311,7 +320,7 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,
break;
}
sprintf (Gbl.Title,Txt_See_page_X_of_Y,
- 1,(unsigned) Pagination->NumPags);
+ 1,Pagination->NumPags);
Act_LinkFormSubmit (Gbl.Title,Font,NULL);
fprintf (Gbl.F.Out,"1");
Act_FormEnd ();
@@ -324,7 +333,8 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,
}
/***** Posible link to page left *****/
- if (Pagination->LeftPage > 1 && Pagination->LeftPage < Pagination->StartPage)
+ if (Pagination->LeftPage > 1 &&
+ Pagination->LeftPage < Pagination->StartPage)
{
fprintf (Gbl.F.Out,"| ",
Font);
@@ -345,8 +355,9 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,
case Pag_THREADS_FORUM:
Act_FormStartAnchor (For_ActionsSeeFor[Gbl.Forum.ForumSelected.Type],
Pagination->Anchor);
- Pag_PutHiddenParamPagNum (WhatPaginate,Pagination->LeftPage);
- For_PutAllHiddenParamsForum (Gbl.Forum.ForumSet,
+ For_PutAllHiddenParamsForum (Pagination->LeftPage, // Page of threads = left
+ 1, // Page of posts = first
+ Gbl.Forum.ForumSet,
Gbl.Forum.ThreadsOrder,
Gbl.Forum.ForumSelected.Location,
-1L,
@@ -355,8 +366,9 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,
case Pag_POSTS_FORUM:
Act_FormStartAnchor (For_ActionsSeePstFor[Gbl.Forum.ForumSelected.Type],
Pagination->Anchor);
- Pag_PutHiddenParamPagNum (WhatPaginate,Pagination->LeftPage);
- For_PutAllHiddenParamsForum (Gbl.Forum.ForumSet,
+ For_PutAllHiddenParamsForum (Gbl.Forum.CurrentPageThrs, // Page of threads = current
+ Pagination->LeftPage, // Page of posts = left
+ Gbl.Forum.ForumSet,
Gbl.Forum.ThreadsOrder,
Gbl.Forum.ForumSelected.Location,
ThrCod,
@@ -394,13 +406,14 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,
break;
}
sprintf (Gbl.Title,Txt_See_page_X_of_Y,
- (unsigned) Pagination->LeftPage,(unsigned) Pagination->NumPags);
+ Pagination->LeftPage,
+ Pagination->NumPags);
Act_LinkFormSubmit (Gbl.Title,Font,NULL);
fprintf (Gbl.F.Out,"%u",
- (unsigned) Pagination->LeftPage);
+ Pagination->LeftPage);
Act_FormEnd ();
fprintf (Gbl.F.Out," | ");
- if (Pagination->LeftPage < Pagination->StartPage-1)
+ if (Pagination->LeftPage < Pagination->StartPage - 1)
fprintf (Gbl.F.Out,""
"…"
" | ",
@@ -415,7 +428,7 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,
fprintf (Gbl.F.Out,"",
Font);
if (!LinkToPagCurrent && NumPage == Pagination->CurrentPage)
- fprintf (Gbl.F.Out,"%u",(unsigned) NumPage);
+ fprintf (Gbl.F.Out,"%u",NumPage);
else
{
switch (WhatPaginate)
@@ -435,8 +448,9 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,
case Pag_THREADS_FORUM:
Act_FormStartAnchor (For_ActionsSeeFor[Gbl.Forum.ForumSelected.Type],
Pagination->Anchor);
- Pag_PutHiddenParamPagNum (WhatPaginate,NumPage);
- For_PutAllHiddenParamsForum (Gbl.Forum.ForumSet,
+ For_PutAllHiddenParamsForum (NumPage, // Page of threads = number of page
+ 1, // Page of posts = first
+ Gbl.Forum.ForumSet,
Gbl.Forum.ThreadsOrder,
Gbl.Forum.ForumSelected.Location,
-1L,
@@ -445,8 +459,9 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,
case Pag_POSTS_FORUM:
Act_FormStartAnchor (For_ActionsSeePstFor[Gbl.Forum.ForumSelected.Type],
Pagination->Anchor);
- Pag_PutHiddenParamPagNum (WhatPaginate,NumPage);
- For_PutAllHiddenParamsForum (Gbl.Forum.ForumSet,
+ For_PutAllHiddenParamsForum (Gbl.Forum.CurrentPageThrs, // Page of threads = current
+ NumPage, // Page of posts = number of page
+ Gbl.Forum.ForumSet,
Gbl.Forum.ThreadsOrder,
Gbl.Forum.ForumSelected.Location,
ThrCod,
@@ -484,10 +499,10 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,
break;
}
sprintf (Gbl.Title,Txt_See_page_X_of_Y,
- (unsigned) NumPage,(unsigned) Pagination->NumPags);
+ NumPage,Pagination->NumPags);
Act_LinkFormSubmit (Gbl.Title,Font,NULL);
fprintf (Gbl.F.Out,"%u",
- (unsigned) NumPage);
+ NumPage);
Act_FormEnd ();
}
fprintf (Gbl.F.Out," | ");
@@ -521,8 +536,9 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,
case Pag_THREADS_FORUM:
Act_FormStartAnchor (For_ActionsSeeFor[Gbl.Forum.ForumSelected.Type],
Pagination->Anchor);
- Pag_PutHiddenParamPagNum (WhatPaginate,Pagination->RightPage);
- For_PutAllHiddenParamsForum (Gbl.Forum.ForumSet,
+ For_PutAllHiddenParamsForum (Pagination->RightPage, // Page of threads = right
+ 1, // Page of posts = first
+ Gbl.Forum.ForumSet,
Gbl.Forum.ThreadsOrder,
Gbl.Forum.ForumSelected.Location,
-1L,
@@ -531,8 +547,9 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,
case Pag_POSTS_FORUM:
Act_FormStartAnchor (For_ActionsSeePstFor[Gbl.Forum.ForumSelected.Type],
Pagination->Anchor);
- Pag_PutHiddenParamPagNum (WhatPaginate,Pagination->RightPage);
- For_PutAllHiddenParamsForum (Gbl.Forum.ForumSet,
+ For_PutAllHiddenParamsForum (Gbl.Forum.CurrentPageThrs, // Page of threads = current
+ Pagination->RightPage, // Page of posts = right
+ Gbl.Forum.ForumSet,
Gbl.Forum.ThreadsOrder,
Gbl.Forum.ForumSelected.Location,
ThrCod,
@@ -570,9 +587,9 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,
break;
}
sprintf (Gbl.Title,Txt_See_page_X_of_Y,
- (unsigned) Pagination->RightPage,(unsigned) Pagination->NumPags);
+ Pagination->RightPage,Pagination->NumPags);
Act_LinkFormSubmit (Gbl.Title,Font,NULL);
- fprintf (Gbl.F.Out,"%u",(unsigned) Pagination->RightPage);
+ fprintf (Gbl.F.Out,"%u",Pagination->RightPage);
Act_FormEnd ();
fprintf (Gbl.F.Out,"");
}
@@ -604,8 +621,9 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,
case Pag_THREADS_FORUM:
Act_FormStartAnchor (For_ActionsSeeFor[Gbl.Forum.ForumSelected.Type],
Pagination->Anchor);
- Pag_PutHiddenParamPagNum (WhatPaginate,Pagination->NumPags);
- For_PutAllHiddenParamsForum (Gbl.Forum.ForumSet,
+ For_PutAllHiddenParamsForum (Pagination->NumPags, // Page of threads = last
+ 1, // Page of posts = first
+ Gbl.Forum.ForumSet,
Gbl.Forum.ThreadsOrder,
Gbl.Forum.ForumSelected.Location,
-1L,
@@ -614,8 +632,9 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,
case Pag_POSTS_FORUM:
Act_FormStartAnchor (For_ActionsSeePstFor[Gbl.Forum.ForumSelected.Type],
Pagination->Anchor);
- Pag_PutHiddenParamPagNum (WhatPaginate,Pagination->NumPags);
- For_PutAllHiddenParamsForum (Gbl.Forum.ForumSet,
+ For_PutAllHiddenParamsForum (Gbl.Forum.CurrentPageThrs, // Page of threads = current
+ Pagination->NumPags, // Page of posts = last
+ Gbl.Forum.ForumSet,
Gbl.Forum.ThreadsOrder,
Gbl.Forum.ForumSelected.Location,
ThrCod,
@@ -653,9 +672,9 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,
break;
}
sprintf (Gbl.Title,Txt_See_page_X_of_Y,
- (unsigned) Pagination->NumPags,(unsigned) Pagination->NumPags);
+ Pagination->NumPags,Pagination->NumPags);
Act_LinkFormSubmit (Gbl.Title,Font,NULL);
- fprintf (Gbl.F.Out,"%u",(unsigned) Pagination->NumPags);
+ fprintf (Gbl.F.Out,"%u",Pagination->NumPags);
Act_FormEnd ();
fprintf (Gbl.F.Out,"");
}
diff --git a/swad_pagination.h b/swad_pagination.h
index 019c97e9a..4f2c09bef 100644
--- a/swad_pagination.h
+++ b/swad_pagination.h
@@ -54,12 +54,12 @@ typedef enum
struct Pagination // Used for threads and messages pagination
{
unsigned NumItems;
- int StartPage;
- int LeftPage;
- int CurrentPage; // 1, 2, 3...
- int RightPage;
- int EndPage;
- int NumPags;
+ unsigned StartPage;
+ unsigned LeftPage;
+ unsigned CurrentPage; // 1, 2, 3...
+ unsigned RightPage;
+ unsigned EndPage;
+ unsigned NumPags;
unsigned FirstItemVisible; // 1, 2, 3...
unsigned LastItemVisible; // 1, 2, 3...
bool MoreThanOnePage;
diff --git a/swad_social.c b/swad_social.c
index 475d67efb..9f2cfa745 100644
--- a/swad_social.c
+++ b/swad_social.c
@@ -1826,7 +1826,9 @@ static void Soc_PutFormGoToAction (const struct SocialNote *SocNot)
return;
case Soc_NOTE_FORUM_POST:
Act_FormStartUnique (For_ActionsSeeFor[Gbl.Forum.ForumSelected.Type]);
- For_PutAllHiddenParamsForum (Gbl.Forum.ForumSet,
+ For_PutAllHiddenParamsForum (1, // Page of threads = first
+ 1, // Page of posts = first
+ Gbl.Forum.ForumSet,
Gbl.Forum.ThreadsOrder,
Gbl.Forum.ForumSelected.Location,
Gbl.Forum.ForumSelected.ThrCod,