enclosing the post. Set the class string to mark the post
+ ** as selected and/or obsolete. */
+ iIndent = (p->pEditHead ? p->pEditHead->nIndent : p->nIndent)-1;
+ @
+
+ /* If this is the first post (or an edit thereof), emit the thread title. */
+ if( pManifest->zThreadTitle ){
+ @
%h(pManifest->zThreadTitle)
+ }
+
+ /* Emit the serial number, revision number, author, and date. */
+ zDisplayName = display_name_from_login(pManifest->zUser);
+ zDate = db_text(0, "SELECT datetime(%.17g)", pManifest->rDate);
+ @
(%d(p->sid)\
+ if( p->nEdit ){
+ @ .%.*d(fossil_num_digits(p->nEdit))(p->rev)\
+ }
+ @ ) By %h(zDisplayName) on %h(zDate)
fossil_free(zDisplayName);
fossil_free(zDate);
- if( p->pEdit ){
- @ edit of %z(href("%R/forumpost/%S?t=%c",p->pEdit->zUuid,cMode))\
- @ %d(p->pEdit->sid)
+
+ /* If this is an edit, refer back to the old version. Be sure "hist" is in
+ ** the query string so the old version will actually be shown. */
+ if( p->pEditPrev ){
+ zHist = bHist ? "" : "&hist";
+ @ edit of \
+ @ %z(href("%R/forumpost/%S?%s%s",p->pEditPrev->zUuid,zQuery,zHist))\
+ @ %d(p->sid).%.*d(fossil_num_digits(p->nEdit))(p->pEditPrev->rev)
}
+
+ /* If debugging is enabled, link to the artifact page. */
if( g.perm.Debug ){
@ \
@ (artifact-%d(p->fpid))
}
- if( p->firt ){
- ForumEntry *pIrt = p->pPrev;
- while( pIrt && pIrt->fpid!=p->firt ) pIrt = pIrt->pPrev;
- if( pIrt ){
- @ in reply to %z(href("%R/forumpost/%S?t=%c",pIrt->zUuid,cMode))\
- @ %d(pIrt->sid)
- }
- }
- zUuid = p->zUuid;
- if( p->pLeaf ){
- @ updated by %z(href("%R/forumpost/%S?t=%c",p->pLeaf->zUuid,cMode))\
- @ %d(p->pLeaf->sid)
- zUuid = p->pLeaf->zUuid;
- }
- if( p->fpid!=target ){
- @ %z(href("%R/forumpost/%S?t=%c",zUuid,cMode))[link]
- }
- if( !bRawMode ){
- @ %z(href("%R/forumpost/%S?raw",zUuid))[source]
- }
- isPrivate = content_is_private(p->fpid);
- sameUser = notAnon && fossil_strcmp(pPost->zUser, g.zLogin)==0;
+
+ /* If this is a reply, refer back to the parent post. */
+ if( p->pIrt ){
+ @ in reply to %z(href("%R/forumpost/%S?%s",p->pIrt->zUuid,zQuery))\
+ @ %d(p->pIrt->sid)\
+ if( p->pIrt->nEdit ){
+ @ .%.*d(fossil_num_digits(p->pIrt->nEdit))(p->pIrt->rev)\
+ }
+ @
+ }
+
+ /* If this post was later edited, refer forward to the next edit. */
+ if( p->pEditNext ){
+ @ updated by %z(href("%R/forumpost/%S?%s",p->pEditNext->zUuid,zQuery))\
+ @ %d(p->pEditNext->sid)\
+ @ .%.*d(fossil_num_digits(p->nEdit))(p->pEditNext->rev)
+ }
+
+ /* Provide a link to select the individual post. */
+ if( !bSelect ){
+ @ %z(href("%R/forumpost/%S?%s",p->zUuid,zQuery))[link]
+ }
+
+ /* Provide a link to the raw source code. */
+ if( !bUnf ){
+ @ %z(href("%R/forumpost/%S?raw",p->zUuid))[source]
+ }
@
- if( isPrivate && !g.perm.ModForum && !sameUser ){
- @
Awaiting Moderator Approval
- }else{
- const char *zMimetype;
- if( bRawMode ){
- zMimetype = "text/plain";
- }else if( p->pLeaf!=0 ){
- zMimetype = "text/plain";
- }else{
- zMimetype = pPost->zMimetype;
- }
- forum_render(0, zMimetype, pPost->zWiki, 0, 1);
- }
- if( g.perm.WrForum && p->pLeaf==0 ){
- int sameUser = login_is_individual()
- && fossil_strcmp(pPost->zUser, g.zLogin)==0;
+ }
+
+ /* Check if this post is approved, also if it's by the current user. */
+ bPrivate = content_is_private(p->fpid);
+ bSameUser = login_is_individual()
+ && fossil_strcmp(pManifest->zUser, g.zLogin)==0;
+
+ /* Render the post if the user is able to see it. */
+ if( bPrivate && !g.perm.ModForum && !bSameUser ){
+ @
Awaiting Moderator Approval
+ }else{
+ if( bRaw || bUnf || p->pEditTail ){
+ zMimetype = "text/plain";
+ }else{
+ zMimetype = pManifest->zMimetype;
+ }
+ forum_render(0, zMimetype, pManifest->zWiki, 0, !bRaw);
+ }
+
+ /* When not in raw mode, finish creating the border around the post. */
+ if( !bRaw ){
+ /* If the user is able to write to the forum and if this post has not been
+ ** edited, create a form with various interaction buttons. */
+ if( g.perm.WrForum && !p->pEditTail ){
@
}
- manifest_destroy(pPost);
@
}
- /* Undocumented "threadtable" query parameter causes thread table
- ** to be displayed for debugging purposes.
- */
+ /* Clean up. */
+ manifest_destroy(pManifest);
+}
+
+/*
+** Possible display modes for forum_display_thread().
+*/
+enum {
+ FD_RAW, /* Like FD_SINGLE, but additionally omit the border, force
+ ** unformatted mode, and inhibit history mode */
+ FD_SINGLE, /* Render a single post and (optionally) its edit history */
+ FD_CHRONO, /* Render all posts in chronological order */
+ FD_HIER, /* Render all posts in an indented hierarchy */
+};
+
+/*
+** Display a forum thread. If mode is FD_RAW or FD_SINGLE, display only a
+** single post from the thread and (optionally) its edit history.
+*/
+static void forum_display_thread(
+ int froot, /* Forum thread root post ID */
+ int fpid, /* Selected forum post ID, or 0 if none selected */
+ int mode, /* Forum display mode, one of the FD_* enumerations */
+ int bUnf, /* True if rendering unformatted */
+ int bHist /* True if showing edit history, ignored for FD_RAW */
+){
+ ForumThread *pThread; /* Thread structure */
+ ForumPost *pSelect; /* Currently selected post, or NULL if none */
+ ForumPost *p; /* Post iterator pointer */
+ char *zQuery; /* Common query string */
+ int iIndentScale = 4; /* Indent scale factor, measured in "ex" units */
+ int sid; /* Comparison serial ID */
+
+ /* In raw mode, force unformatted display and disable history. */
+ if( mode == FD_RAW ){
+ bUnf = 1;
+ bHist = 0;
+ }
+
+ /* Thread together the posts and (optionally) compute the hierarchy. */
+ pThread = forumthread_create(froot, mode==FD_HIER);
+
+ /* Compute the appropriate indent scaling. */
+ if( mode==FD_HIER ){
+ iIndentScale = 4;
+ while( iIndentScale>1 && iIndentScale*pThread->mxIndent>25 ){
+ iIndentScale--;
+ }
+ }else{
+ iIndentScale = 0;
+ }
+
+ /* Find the selected post, or (depending on parameters) its latest edit. */
+ pSelect = fpid ? forumpost_forward(pThread->pFirst, fpid) : 0;
+ if( !bHist && mode!=FD_RAW && pSelect && pSelect->pEditTail ){
+ pSelect = pSelect->pEditTail;
+ }
+
+ /* When displaying only a single post, abort if no post was selected or the
+ ** selected forum post does not exist in the thread. Otherwise proceed to
+ ** display the entire thread without marking any posts as selected. */
+ if( !pSelect && (mode==FD_RAW || mode==FD_SINGLE) ){
+ return;
+ }
+
+ /* Create the common query string to append to nearly all post links. */
+ zQuery = mode==FD_RAW ? 0 : mprintf("t=%c%s%s",
+ mode==FD_SINGLE ? 's' : mode==FD_CHRONO ? 'c' : 'h',
+ bUnf ? "&unf" : "", bHist ? "&hist" : "");
+
+ /* Identify which post to display first. If history is shown, start with the
+ ** original, unedited post. Otherwise advance to the post's latest edit. */
+ if( mode==FD_RAW || mode==FD_SINGLE ){
+ p = pSelect;
+ if( bHist && p->pEditHead ) p = p->pEditHead;
+ }else{
+ p = mode==FD_CHRONO ? pThread->pFirst : pThread->pDisplay;
+ if( !bHist && p->pEditTail ) p = p->pEditTail;
+ }
+
+ /* Display the appropriate subset of posts in sequence. */
+ while( p ){
+ /* Display the post. */
+ forum_display_post(p, iIndentScale, mode==FD_RAW,
+ bUnf, bHist, p==pSelect, zQuery);
+
+ /* Advance to the next post in the thread. */
+ if( mode==FD_CHRONO ){
+ /* Chronological mode: display posts (optionally including edits) in their
+ ** original commit order. */
+ if( bHist ){
+ p = p->pNext;
+ }else{
+ sid = p->sid;
+ if( p->pEditHead ) p = p->pEditHead;
+ do p = p->pNext; while( p && p->sid<=sid );
+ if( p && p->pEditTail ) p = p->pEditTail;
+ }
+ }else if( bHist && p->pEditNext ){
+ /* Hierarchical and single mode: display each post's edits in sequence. */
+ p = p->pEditNext;
+ }else if( mode==FD_HIER ){
+ /* Hierarchical mode: after displaying with each post (optionally
+ ** including edits), go to the next post in computed display order. */
+ p = p->pEditHead ? p->pEditHead->pDisplay : p->pDisplay;
+ if( !bHist && p && p->pEditTail ) p = p->pEditTail;
+ }else{
+ /* Single and raw mode: terminate after displaying the selected post and
+ ** (optionally) its edits. */
+ break;
+ }
+ }
+
+ /* Undocumented "threadtable" query parameter causes thread table to be
+ ** displayed for debugging purposes. */
if( PB("threadtable") ){
@
@
- @ | sid | fpid | firt | fprev | mfirt | pLeaf | nReply | hash
+ @ |
|---|
| sid | rev | fpid | pIrt | pEditHead | pEditTail\
+ @ | pEditNext | pEditPrev | pDisplay | hash
for(p=pThread->pFirst; p; p=p->pNext){
- @ |
|---|
| %d(p->sid) | %d(p->fpid) | %d(p->firt)\
- @ | %d(p->fprev) | %d(p->mfirt)\
- @ | %d(p->pLeaf?p->pLeaf->fpid:0) | %d(p->nReply)\
+ @ |
| %d(p->sid) | %d(p->rev) | %d(p->fpid)\
+ @ | %d(p->pIrt ? p->pIrt->fpid : 0)\
+ @ | %d(p->pEditHead ? p->pEditHead->fpid : 0)\
+ @ | %d(p->pEditTail ? p->pEditTail->fpid : 0)\
+ @ | %d(p->pEditNext ? p->pEditNext->fpid : 0)\
+ @ | %d(p->pEditPrev ? p->pEditPrev->fpid : 0)\
+ @ | %d(p->pDisplay ? p->pDisplay->fpid : 0)\
@ | %S(p->zUuid) |
}
@
}
- forumthread_delete(pThread);
-}
-/*
-** Display all the edit history of post "target".
-*/
-static void forum_display_history(int froot, int target, int bRawMode){
- ForumThread *pThread = forumthread_create(froot, 0);
- ForumEntry *p;
- int notAnon = login_is_individual();
- char cMode = bRawMode ? 'r' : 'c';
- ForumEntry *pLeaf = 0;
- int cnt = 0;
- for(p=pThread->pFirst; p; p=p->pNext){
- if( p->fpid==target ){
- pLeaf = p->pLeaf ? p->pLeaf : p;
- break;
- }
- }
- for(p=pThread->pFirst; p; p=p->pNext){
- char *zDate;
- Manifest *pPost;
- int isPrivate; /* True for posts awaiting moderation */
- int sameUser; /* True if author is also the reader */
- const char *zUuid;
- char *zDisplayName; /* The display name */
-
- if( p->fpid!=pLeaf->fpid && p->pLeaf!=pLeaf ) continue;
- cnt++;
- pPost = manifest_get(p->fpid, CFTYPE_FORUM, 0);
- if( pPost==0 ) continue;
- @
- zDate = db_text(0, "SELECT datetime(%.17g)", pPost->rDate);
- zDisplayName = display_name_from_login(pPost->zUser);
- @
(%d(p->sid)) By %h(zDisplayName) on %h(zDate)
- fossil_free(zDisplayName);
- fossil_free(zDate);
- if( g.perm.Debug ){
- @ \
- @ (artifact-%d(p->fpid))
- }
- if( p->firt && cnt==1 ){
- ForumEntry *pIrt = p->pPrev;
- while( pIrt && pIrt->fpid!=p->firt ) pIrt = pIrt->pPrev;
- if( pIrt ){
- @ in reply to %z(href("%R/forumpost/%S?t=%c",pIrt->zUuid,cMode))\
- @ %d(pIrt->sid)
- }
- }
- zUuid = p->zUuid;
- @ %z(href("%R/forumpost/%S?t=c",zUuid))[link]
- if( !bRawMode ){
- @ %z(href("%R/forumpost/%S?raw",zUuid))[source]
- }
- isPrivate = content_is_private(p->fpid);
- sameUser = notAnon && fossil_strcmp(pPost->zUser, g.zLogin)==0;
- @
- if( isPrivate && !g.perm.ModForum && !sameUser ){
- @
Awaiting Moderator Approval
- }else{
- forum_render(0, bRawMode?"text/plain":pPost->zMimetype, pPost->zWiki,
- 0, 1);
- }
- if( g.perm.WrForum && p->pLeaf==0 ){
- int sameUser = login_is_individual()
- && fossil_strcmp(pPost->zUser, g.zLogin)==0;
- @
- }
- manifest_destroy(pPost);
- @
- }
- forumthread_delete(pThread);
-}
-
-/*
-** Display all messages in a forumthread with indentation.
-*/
-static int forum_display_hierarchical(int froot, int target){
- ForumThread *pThread;
- ForumEntry *p;
- Manifest *pPost, *pOPost;
- int fpid;
- const char *zUuid;
- char *zDate;
- const char *zSel;
- int notAnon = login_is_individual();
- int iIndentScale = 4;
-
- pThread = forumthread_create(froot, 1);
- for(p=pThread->pFirst; p; p=p->pNext){
- if( p->fpid==target ){
- while( p->pEdit ) p = p->pEdit;
- target = p->fpid;
- break;
- }
- }
- while( iIndentScale>1 && iIndentScale*pThread->mxIndent>25 ){
- iIndentScale--;
- }
- for(p=pThread->pDisplay; p; p=p->pDisplay){
- int isPrivate; /* True for posts awaiting moderation */
- int sameUser; /* True if reader is also the poster */
- char *zDisplayName; /* User name to be displayed */
- pOPost = manifest_get(p->fpid, CFTYPE_FORUM, 0);
- if( p->pLeaf ){
- fpid = p->pLeaf->fpid;
- zUuid = p->pLeaf->zUuid;
- pPost = manifest_get(fpid, CFTYPE_FORUM, 0);
- }else{
- fpid = p->fpid;
- zUuid = p->zUuid;
- pPost = pOPost;
- }
- zSel = p->fpid==target ? " forumSel" : "";
- if( p->nIndent==1 ){
- @
- }else{
- @
- }
- if( pPost==0 ) continue;
- if( pPost->zThreadTitle ){
- @
%h(pPost->zThreadTitle)
- }
- zDate = db_text(0, "SELECT datetime(%.17g)", pOPost->rDate);
- zDisplayName = display_name_from_login(pOPost->zUser);
- @
\
- @ (%d(p->sid)) By %h(zDisplayName) on %h(zDate)
- fossil_free(zDisplayName);
- fossil_free(zDate);
- if( g.perm.Debug ){
- @ \
- @ (artifact-%d(p->fpid))
- }
- if( p->pLeaf ){
- zDate = db_text(0, "SELECT datetime(%.17g)", pPost->rDate);
- if( fossil_strcmp(pOPost->zUser,pPost->zUser)==0 ){
- @ and edited on %h(zDate)
- }else{
- @ as edited by %h(pPost->zUser) on %h(zDate)
- }
- fossil_free(zDate);
- if( g.perm.Debug ){
- @ \
- @ \
- @ (artifact-%d(p->pLeaf->fpid))
- }
- @ %z(href("%R/forumpost/%S?t=y",p->zUuid))[history]
- manifest_destroy(pOPost);
- }
- if( fpid!=target ){
- @ %z(href("%R/forumpost/%S",zUuid))[link]
- }
- @ %z(href("%R/forumpost/%S?raw",zUuid))[source]
- if( p->firt ){
- ForumEntry *pIrt = p->pPrev;
- while( pIrt && pIrt->fpid!=p->mfirt ) pIrt = pIrt->pPrev;
- if( pIrt ){
- @ in reply to %z(href("%R/forumpost/%S?t=h",pIrt->zUuid))\
- @ %d(pIrt->sid)
- }
- }
- @
- isPrivate = content_is_private(fpid);
- sameUser = notAnon && fossil_strcmp(pPost->zUser, g.zLogin)==0;
- if( isPrivate && !g.perm.ModForum && !sameUser ){
- @
Awaiting Moderator Approval
- }else{
- forum_render(0, pPost->zMimetype, pPost->zWiki, 0, 1);
- }
- if( g.perm.WrForum ){
- @
- }
- manifest_destroy(pPost);
- @
- }
- forumthread_delete(pThread);
- return target;
-}
-
-/*
-** Emits all JS code required by /forumpost.
-*/
-static void forumpost_emit_page_js(){
- static int once = 0;
- if(0==once){
- once = 1;
- style_emit_script_fossil_bootstrap(1);
- builtin_request_js("forum.js");
- builtin_request_js("fossil.dom.js");
- builtin_request_js("fossil.page.forumpost.js");
- }
+ /* Clean up. */
+ forumthread_delete(pThread);
+ fossil_free(zQuery);
}
/*
** WEBPAGE: forumpost
**
** Show a single forum posting. The posting is shown in context with
-** it's entire thread. The selected posting is enclosed within
+** its entire thread. The selected posting is enclosed within
**
...
. Javascript is used to move the
** selected posting into view after the page loads.
**
** Query parameters:
**
-** name=X REQUIRED. The hash of the post to display
-** t=MODE Display mode.
-** 'c' for chronological
-** 'h' for hierarchical
-** 'a' for automatic
-** 'r' for raw
-** 'y' for history of post X only
-** raw If present, show only the post specified and
-** show its original unformatted source text.
+** name=X REQUIRED. The hash of the post to display.
+** t=a Automatic display mode, i.e. hierarchical for
+** desktop and chronological for mobile. This is the
+** default if the "t" query parameter is omitted.
+** t=c Show posts in the order they were written.
+** t=h Show posts usin hierarchical indenting.
+** t=s Show only the post specified by "name=X".
+** t=r Alias for "t=c&unf&hist".
+** t=y Alias for "t=s&unf&hist".
+** raw Alias for "t=s&unf". Additionally, omit the border
+** around the post, and ignore "t" and "hist".
+** unf Show the original, unformatted source text.
+** hist Show edit history in addition to current posts.
*/
void forumpost_page(void){
forumthread_page();
}
-/*
-** Add an appropriate style_header() to include title of the
-** given forum post.
-*/
-static int forumthread_page_header(int froot, int fpid){
- char *zThreadTitle = 0;
-
- zThreadTitle = db_text("",
- "SELECT"
- " substr(event.comment,instr(event.comment,':')+2)"
- " FROM forumpost, event"
- " WHERE event.objid=forumpost.fpid"
- " AND forumpost.fpid=%d;",
- fpid
- );
- style_header("%s%s", zThreadTitle, zThreadTitle[0] ? "" : "Forum");
- fossil_free(zThreadTitle);
- return 0;
-}
-
/*
** WEBPAGE: forumthread
**
** Show all forum messages associated with a particular message thread.
** The result is basically the same as /forumpost except that none of
@@ -816,24 +715,28 @@
** the postings in the thread are selected.
**
** Query parameters:
**
** name=X REQUIRED. The hash of any post of the thread.
-** t=MODE Display mode. MODE is...
-** 'c' for chronological, or
-** 'h' for hierarchical, or
-** 'a' for automatic, or
-** 'r' for raw.
-** raw Show only the post given by name= and show it unformatted
-** hist Show only the edit history for the name= post
+** t=a Automatic display mode, i.e. hierarchical for
+** desktop and chronological for mobile. This is the
+** default if the "t" query parameter is omitted.
+** t=c Show posts in the order they were written.
+** t=h Show posts using hierarchical indenting.
+** unf Show the original, unformatted source text.
+** hist Show edit history in addition to current posts.
*/
void forumthread_page(void){
int fpid;
int froot;
+ char *zThreadTitle;
const char *zName = P("name");
const char *zMode = PD("t","a");
int bRaw = PB("raw");
+ int bUnf = PB("unf");
+ int bHist = PB("hist");
+ int mode;
login_check_credentials();
if( !g.perm.RdForum ){
login_needed(g.anon.RdForum);
return;
}
@@ -847,54 +750,70 @@
froot = db_int(0, "SELECT froot FROM forumpost WHERE fpid=%d", fpid);
if( froot==0 ){
webpage_error("Not a forum post: \"%s\"", zName);
}
if( fossil_strcmp(g.zPath,"forumthread")==0 ) fpid = 0;
- if( zMode[0]=='a' ){
- if( cgi_from_mobile() ){
- zMode = "c"; /* Default to chronological on mobile */
- }else{
- zMode = "h";
- }
- }
- if( zMode[0]!='y' ){
- forumthread_page_header(froot, fpid);
- }
- if( bRaw && fpid ){
- Manifest *pPost;
- pPost = manifest_get(fpid, CFTYPE_FORUM, 0);
- if( pPost==0 ){
- @
No such forum post: %h(zName)
- }else{
- int isPrivate = content_is_private(fpid);
- int notAnon = login_is_individual();
- int sameUser = notAnon && fossil_strcmp(pPost->zUser, g.zLogin)==0;
- if( isPrivate && !g.perm.ModForum && !sameUser ){
- @
Awaiting Moderator Approval
- }else{
- forum_render(0, "text/plain", pPost->zWiki, 0, 0);
- }
- manifest_destroy(pPost);
- }
- }else if( zMode[0]=='c' ){
- style_submenu_element("Hierarchical", "%R/%s/%s?t=h", g.zPath, zName);
- style_submenu_element("Unformatted", "%R/%s/%s?t=r", g.zPath, zName);
- forum_display_chronological(froot, fpid, 0);
- }else if( zMode[0]=='r' ){
- style_submenu_element("Chronological", "%R/%s/%s?t=c", g.zPath, zName);
- style_submenu_element("Hierarchical", "%R/%s/%s?t=h", g.zPath, zName);
- forum_display_chronological(froot, fpid, 1);
- }else if( zMode[0]=='y' ){
- style_header("Edit History Of A Forum Post");
- style_submenu_element("Complete Thread", "%R/%s/%s?t=a", g.zPath, zName);
- forum_display_history(froot, fpid, 1);
- }else{
- style_submenu_element("Chronological", "%R/%s/%s?t=c", g.zPath, zName);
- style_submenu_element("Unformatted", "%R/%s/%s?t=r", g.zPath, zName);
- forum_display_hierarchical(froot, fpid);
- }
- forumpost_emit_page_js();
+
+ /* Decode the mode parameters. */
+ if( bRaw ){
+ mode = FD_RAW;
+ bUnf = 1;
+ bHist = 0;
+ cgi_replace_query_parameter("unf", "on");
+ cgi_delete_query_parameter("hist");
+ cgi_delete_query_parameter("raw");
+ }else{
+ switch( *zMode ){
+ case 'a': mode = cgi_from_mobile() ? FD_CHRONO : FD_HIER; break;
+ case 'c': mode = FD_CHRONO; break;
+ case 'h': mode = FD_HIER; break;
+ case 's': mode = FD_SINGLE; break;
+ case 'r': mode = FD_CHRONO; break;
+ case 'y': mode = FD_SINGLE; break;
+ default: webpage_error("Invalid thread mode: \"%s\"", zMode);
+ }
+ if( *zMode=='r' || *zMode=='y') {
+ bUnf = 1;
+ bHist = 1;
+ cgi_replace_query_parameter("t", mode==FD_CHRONO ? "c" : "s");
+ cgi_replace_query_parameter("unf", "on");
+ cgi_replace_query_parameter("hist", "on");
+ }
+ }
+
+ /* Define the page header. */
+ zThreadTitle = db_text("",
+ "SELECT"
+ " substr(event.comment,instr(event.comment,':')+2)"
+ " FROM forumpost, event"
+ " WHERE event.objid=forumpost.fpid"
+ " AND forumpost.fpid=%d;",
+ fpid
+ );
+ style_header("%s%s", zThreadTitle, *zThreadTitle ? "" : "Forum");
+ fossil_free(zThreadTitle);
+ if( mode!=FD_CHRONO ){
+ style_submenu_element("Chronological", "%R/%s/%s?t=c%s%s", g.zPath, zName,
+ bUnf ? "&unf" : "", bHist ? "&hist" : "");
+ }
+ if( mode!=FD_HIER ){
+ style_submenu_element("Hierarchical", "%R/%s/%s?t=h%s%s", g.zPath, zName,
+ bUnf ? "&unf" : "", bHist ? "&hist" : "");
+ }
+ style_submenu_checkbox("unf", "Unformatted", 0, 0);
+ style_submenu_checkbox("hist", "History", 0, 0);
+
+ /* Display the thread. */
+ forum_display_thread(froot, fpid, mode, bUnf, bHist);
+
+ /* Emit Forum Javascript. */
+ style_emit_script_fossil_bootstrap(1);
+ builtin_request_js("forum.js");
+ builtin_request_js("fossil.dom.js");
+ builtin_request_js("fossil.page.forumpost.js");
+
+ /* Emit the page style. */
style_footer();
}
/*
** Return true if a forum post should be moderated.
@@ -949,11 +868,11 @@
webpage_assert( (zTitle==0)+(iInReplyTo==0)==1 );
blob_init(&x, 0, 0);
zDate = date_in_standard_format("now");
blob_appendf(&x, "D %s\n", zDate);
fossil_free(zDate);
- zG = db_text(0,
+ zG = db_text(0,
"SELECT uuid FROM blob, forumpost"
" WHERE blob.rid==forumpost.froot"
" AND forumpost.fpid=%d", iBasis);
if( zG ){
blob_appendf(&x, "G %s\n", zG);
@@ -1017,11 +936,11 @@
}
/*
** Paint the form elements for entering a Forum post
*/
-static void forum_entry_widget(
+static void forum_post_widget(
const char *zTitle,
const char *zMimetype,
const char *zContent
){
if( zTitle ){
@@ -1126,11 +1045,11 @@
}
style_header("New Forum Thread");
@