Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch andygoth-forum-refactor Excluding Merge-Ins
This is equivalent to a diff from 273dd80e to 71fe590e
2020-08-22
| ||
15:34 | Improvements to the forum thread display. Additional details on the forum thread. ... (check-in: 5182a1bf user: drh tags: trunk) | |
10:45 | Merge Andy Goth's enhancements to the forum. ... (Closed-Leaf check-in: 50cdb741 user: drh tags: sec2020-forum-refactor) | |
03:06 | Guard against an infinite loop in certain pathological edit patterns ... (Closed-Leaf check-in: 71fe590e user: andygoth tags: andygoth-forum-refactor) | |
02:53 | Link to the next edit rather than the final edit ... (check-in: 91a3a600 user: andygoth tags: andygoth-forum-refactor) | |
00:23 | Update the custom MinGW makefile. ... (check-in: 6eb1f434 user: mistachkin tags: trunk) | |
2020-08-21
| ||
15:54 | Begin refactoring forum code to support orthogonal history and plaintext options. First step: rename pEdit to pEditPrev to make room for a pEditNext field. ... (check-in: 636f6596 user: andygoth tags: andygoth-forum-refactor) | |
14:40 | Add missing bold markup ... (check-in: 273dd80e user: andygoth tags: trunk) | |
2020-08-20
| ||
22:40 | Using parameters to namespace functions in fossil*.js instead of the global "fossil" object. Squishes a complaint by GCC and makes the code a smidge smaller besides. ... (check-in: 0f03f78a user: wyoung tags: trunk) | |
Changes to src/forum.c.
︙ | ︙ | |||
24 25 26 27 28 29 30 | /* ** Default to using Markdown markup */ #define DEFAULT_FORUM_MIMETYPE "text/x-markdown" #if INTERFACE /* | | | | < < < < > > > | > | | | | > | | | | | | | | | | | < | | < | | | | | | | | | > > > | | | | | | < | > | > | < > | | | | | | < | | | < | | > | > > | > > > | > | < | < < | | < < < < > | < | | | | | | < > | | > > | | | | | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 | /* ** Default to using Markdown markup */ #define DEFAULT_FORUM_MIMETYPE "text/x-markdown" #if INTERFACE /* ** Each instance of the following object represents a single message - ** either the initial post, an edit to a post, a reply, or an edit to ** a reply. */ struct ForumPost { int fpid; /* rid for this post */ int sid; /* Serial ID number */ int rev; /* Revision number */ char *zUuid; /* Artifact hash */ ForumPost *pIrt; /* This post replies to pIrt */ ForumPost *pEditHead; /* Original, unedited post */ ForumPost *pEditTail; /* Most recent edit for this post */ ForumPost *pEditNext; /* This post is edited by pEditNext */ ForumPost *pEditPrev; /* This post is an edit of pEditPrev */ ForumPost *pNext; /* Next in chronological order */ ForumPost *pPrev; /* Previous in chronological order */ ForumPost *pDisplay; /* Next in display order */ int nEdit; /* Number of edits to this post */ int nIndent; /* Number of levels of indentation for this post */ }; /* ** A single instance of the following tracks all entries for a thread. */ struct ForumThread { ForumPost *pFirst; /* First post in chronological order */ ForumPost *pLast; /* Last post in chronological order */ ForumPost *pDisplay; /* Entries in display order */ ForumPost *pTail; /* Last on the display list */ int mxIndent; /* Maximum indentation level */ }; #endif /* INTERFACE */ /* ** Return true if the forum post with the given rid has been ** subsequently edited. */ int forum_rid_has_been_edited(int rid){ static Stmt q; int res; db_static_prepare(&q, "SELECT 1 FROM forumpost A, forumpost B" " WHERE A.fpid=$rid AND B.froot=A.froot AND B.fprev=$rid" ); db_bind_int(&q, "$rid", rid); res = db_step(&q)==SQLITE_ROW; db_reset(&q); return res; } /* ** Delete a complete ForumThread and all its entries. */ static void forumthread_delete(ForumThread *pThread){ ForumPost *pPost, *pNext; for(pPost=pThread->pFirst; pPost; pPost = pNext){ pNext = pPost->pNext; fossil_free(pPost->zUuid); fossil_free(pPost); } fossil_free(pThread); } /* ** Search a ForumPost list forwards looking for the post with fpid */ static ForumPost *forumpost_forward(ForumPost *p, int fpid){ while( p && p->fpid!=fpid ) p = p->pNext; return p; } /* ** Search backwards for a ForumPost */ static ForumPost *forumpost_backward(ForumPost *p, int fpid){ while( p && p->fpid!=fpid ) p = p->pPrev; return p; } /* ** Add a post to the display list */ static void forumpost_add_to_display(ForumThread *pThread, ForumPost *p){ if( pThread->pDisplay==0 ){ pThread->pDisplay = p; }else{ pThread->pTail->pDisplay = p; } pThread->pTail = p; } /* ** Extend the display list for pThread by adding all entries that ** reference fpid. The first such post will be no earlier then ** post "p". */ static void forumthread_display_order( ForumThread *pThread, /* The complete thread */ ForumPost *pBase /* Add replies to this post */ ){ ForumPost *p; ForumPost *pPrev = 0; ForumPost *pBaseIrt; for(p=pBase->pNext; p; p=p->pNext){ if( !p->pEditPrev && p->pIrt ){ pBaseIrt = p->pIrt->pEditHead ? p->pIrt->pEditHead : p->pIrt; if( pBaseIrt==pBase ){ if( pPrev ){ pPrev->nIndent = pBase->nIndent + 1; forumpost_add_to_display(pThread, pPrev); forumthread_display_order(pThread, pPrev); } pPrev = p; } } } if( pPrev ){ pPrev->nIndent = pBase->nIndent + 1; if( pPrev->nIndent>pThread->mxIndent ) pThread->mxIndent = pPrev->nIndent; forumpost_add_to_display(pThread, pPrev); forumthread_display_order(pThread, pPrev); } } /* ** Construct a ForumThread object given the root record id. */ static ForumThread *forumthread_create(int froot, int computeHierarchy){ ForumThread *pThread; ForumPost *pPost; ForumPost *p; Stmt q; int sid = 1; int firt, fprev; pThread = fossil_malloc( sizeof(*pThread) ); memset(pThread, 0, sizeof(*pThread)); db_prepare(&q, "SELECT fpid, firt, fprev, (SELECT uuid FROM blob WHERE rid=fpid)" " FROM forumpost" " WHERE froot=%d ORDER BY fmtime", froot ); while( db_step(&q)==SQLITE_ROW ){ pPost = fossil_malloc( sizeof(*pPost) ); memset(pPost, 0, sizeof(*pPost)); pPost->fpid = db_column_int(&q, 0); firt = db_column_int(&q, 1); fprev = db_column_int(&q, 2); pPost->zUuid = fossil_strdup(db_column_text(&q,3)); if( !fprev ) pPost->sid = sid++; pPost->pPrev = pThread->pLast; pPost->pNext = 0; if( pThread->pLast==0 ){ pThread->pFirst = pPost; }else{ pThread->pLast->pNext = pPost; } pThread->pLast = pPost; /* Find the in-reply-to post. Default to the topic post if the replied-to ** post cannot be found. */ if( firt ){ pPost->pIrt = pThread->pFirst; for(p=pThread->pFirst; p; p=p->pNext){ if( p->fpid==firt ){ pPost->pIrt = p; break; } } } /* Maintain the linked list of post edits. */ if( fprev ){ p = forumpost_backward(pPost->pPrev, fprev); p->pEditNext = pPost; pPost->sid = p->sid; pPost->rev = p->rev+1; pPost->nEdit = p->nEdit+1; pPost->pEditPrev = p; pPost->pEditHead = p->pEditHead ? p->pEditHead : p; for(; p; p=p->pEditPrev ){ p->nEdit = pPost->nEdit; p->pEditTail = pPost; } } } db_finalize(&q); if( computeHierarchy ){ /* Compute the hierarchical display order */ pPost = pThread->pFirst; pPost->nIndent = 1; pThread->mxIndent = 1; forumpost_add_to_display(pThread, pPost); forumthread_display_order(pThread, pPost); } /* Return the result */ return pThread; } /* |
︙ | ︙ | |||
263 264 265 266 267 268 269 | ** This command is intended for testing an analysis only. */ void forumthread_cmd(void){ int fpid; int froot; const char *zName; ForumThread *pThread; | | | 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 | ** This command is intended for testing an analysis only. */ void forumthread_cmd(void){ int fpid; int froot; const char *zName; ForumThread *pThread; ForumPost *p; db_find_and_open_repository(0,0); verify_all_options(); if( g.argc==2 ){ forum_thread_list(); return; } |
︙ | ︙ | |||
291 292 293 294 295 296 297 | fossil_print("fpid = %d\n", fpid); fossil_print("froot = %d\n", froot); pThread = forumthread_create(froot, 1); fossil_print("Chronological:\n"); fossil_print( /* 0 1 2 3 4 5 6 7 */ /* 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123 */ | | | | > | | | | 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 | fossil_print("fpid = %d\n", fpid); fossil_print("froot = %d\n", froot); pThread = forumthread_create(froot, 1); fossil_print("Chronological:\n"); fossil_print( /* 0 1 2 3 4 5 6 7 */ /* 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123 */ " sid rev fpid pIrt pEditPrev pEditTail hash\n"); for(p=pThread->pFirst; p; p=p->pNext){ fossil_print("%4d %4d %9d %9d %9d %9d %8.8s\n", p->sid, p->rev, p->fpid, p->pIrt ? p->pIrt->fpid : 0, p->pEditPrev ? p->pEditPrev->fpid : 0, p->pEditTail ? p->pEditTail->fpid : 0, p->zUuid); } fossil_print("\nDisplay\n"); for(p=pThread->pDisplay; p; p=p->pDisplay){ fossil_print("%*s", (p->nIndent-1)*3, ""); if( p->pEditTail ){ fossil_print("%d->%d\n", p->fpid, p->pEditTail->fpid); }else{ fossil_print("%d\n", p->fpid); } } forumthread_delete(pThread); } |
︙ | ︙ | |||
350 351 352 353 354 355 356 | @ <i>Deleted</i> } if( zClass ){ @ </div> } } | < < < < < < < < < < < < < < < < < < | 354 355 356 357 358 359 360 361 362 363 364 365 366 367 | @ <i>Deleted</i> } if( zClass ){ @ </div> } } /* ** Compute a display name from a login name. ** ** If the input login is found in the USER table, then check the USER.INFO ** field to see if it has display-name followed by an email address. ** If it does, that becomes the new display name. If not, let the display ** name just be the login. |
︙ | ︙ | |||
401 402 403 404 405 406 407 | zResult = fossil_strdup(zLogin); } db_reset(&q); return zResult; } /* | | | < | | | > > > > | > | > | | | > | | > > > | > > | | | | | < | > | < > > > | | | > | < > | > > > > > > > | > | > | > > | | < | | | > > > | > | | | | | > > | > > | | < < > > > > > > > > | | | < | | < < | | | | | > > > > > | < < | | < | | > | > > | > > > > | | < > > > > | > | > > > > > > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | < | > | | > > > > | < < < < < < < < < < < < < < < < < < < < < < < < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | < < | | | < > > | > > > | > > < < < < < < < < < < < < < < < < < < < < < < | | | > > | | > > > > | > | | > > > > > | | > > > > > > > > > > > > > | < < | < < < < < < > | < < < < > > | < > > > | > > > > > | | | > > | < < | | > | | | | | < < < > | | | | 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 | zResult = fossil_strdup(zLogin); } db_reset(&q); return zResult; } /* ** Display a single post in a forum thread. */ static void forum_display_post( ForumPost *p, /* Forum post to display */ int iIndentScale, /* Indent scale factor */ int bRaw, /* True to omit the border */ int bUnf, /* True to leave the post unformatted */ int bHist, /* True if showing edit history */ int bSelect, /* True if this is the selected post */ char *zQuery /* Common query string */ ){ char *zDisplayName; /* The display name */ char *zDate; /* The time/date string */ char *zHist; /* History query string */ Manifest *pManifest; /* Manifest comprising the current post */ int bPrivate; /* True for posts awaiting moderation */ int bSameUser; /* True if author is also the reader */ int iIndent; /* Indent level */ const char *zMimetype;/* Formatting MIME type */ /* Get the manifest for the post. Abort if not found (e.g. shunned). */ pManifest = manifest_get(p->fpid, CFTYPE_FORUM, 0); if( !pManifest ) return; /* When not in raw mode, create the border around the post. */ if( !bRaw ){ /* Open the <div> 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; @ <div id='forum%d(p->fpid)' class='forumTime\ @ %s(bSelect ? " forumSel" : "")\ @ %s(p->pEditTail ? " forumObs" : "")'\ if( iIndent && iIndentScale ){ @ style='margin-left: %d(iIndent*iIndentScale)ex' } @ > /* If this is the first post (or an edit thereof), emit the thread title. */ if( pManifest->zThreadTitle ){ @ <h1>%h(pManifest->zThreadTitle)</h1> } /* 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); @ <h3 class='forumPostHdr'>(%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 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)</a> } /* If debugging is enabled, link to the artifact page. */ if( g.perm.Debug ){ @ <span class="debug">\ @ <a href="%R/artifact/%h(p->zUuid)">(artifact-%d(p->fpid))</a></span> } /* 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)\ } @ </a> } /* 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)</a> } /* Provide a link to select the individual post. */ if( !bSelect ){ @ %z(href("%R/forumpost/%S?%s",p->zUuid,zQuery))[link]</a> } /* Provide a link to the raw source code. */ if( !bUnf ){ @ %z(href("%R/forumpost/%S?raw",p->zUuid))[source]</a> } @ </h3> } /* 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 ){ @ <p><span class="modpending">Awaiting Moderator Approval</span></p> }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 ){ @ <div><form action="%R/forumedit" method="POST"> @ <input type="hidden" name="fpid" value="%s(p->zUuid)"> if( !bPrivate ){ /* Reply and Edit are only available if the post has been approved. */ @ <input type="submit" name="reply" value="Reply"> if( g.perm.Admin || bSameUser ){ @ <input type="submit" name="edit" value="Edit"> @ <input type="submit" name="nullout" value="Delete"> } }else if( g.perm.ModForum ){ /* Allow moderators to approve or reject pending posts. Also allow ** forum supervisors to mark non-special users as trusted and therefore ** able to post unmoderated. */ @ <input type="submit" name="approve" value="Approve"> @ <input type="submit" name="reject" value="Reject"> if( g.perm.AdminForum && !login_is_special(pManifest->zUser) ){ @ <br><label><input type="checkbox" name="trust"> @ Trust user "%h(pManifest->zUser)" so that future posts by \ @ "%h(pManifest->zUser)" do not require moderation. @ </label> @ <input type="hidden" name="trustuser" value="%h(pManifest->zUser)"> } }else if( bSameUser ){ /* Allow users to delete (reject) their own pending posts. */ @ <input type="submit" name="reject" value="Delete"> } @ </form></div> } @ </div> } /* 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") ){ @ <hr> @ <table border="1" cellpadding="3" cellspacing="0"> @ <tr><th>sid<th>rev<th>fpid<th>pIrt<th>pEditHead<th>pEditTail\ @ <th>pEditNext<th>pEditPrev<th>pDisplay<th>hash for(p=pThread->pFirst; p; p=p->pNext){ @ <tr><td>%d(p->sid)<td>%d(p->rev)<td>%d(p->fpid)\ @ <td>%d(p->pIrt ? p->pIrt->fpid : 0)\ @ <td>%d(p->pEditHead ? p->pEditHead->fpid : 0)\ @ <td>%d(p->pEditTail ? p->pEditTail->fpid : 0)\ @ <td>%d(p->pEditNext ? p->pEditNext->fpid : 0)\ @ <td>%d(p->pEditPrev ? p->pEditPrev->fpid : 0)\ @ <td>%d(p->pDisplay ? p->pDisplay->fpid : 0)\ @ <td>%S(p->zUuid)</tr> } @ </table> } /* Clean up. */ forumthread_delete(pThread); fossil_free(zQuery); } /* ** WEBPAGE: forumpost ** ** Show a single forum posting. The posting is shown in context with ** its entire thread. The selected posting is enclosed within ** <div class='forumSel'>...</div>. 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=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(); } /* ** WEBPAGE: forumthread ** ** Show all forum messages associated with a particular message thread. ** The result is basically the same as /forumpost except that none of ** the postings in the thread are selected. ** ** Query parameters: ** ** name=X REQUIRED. The hash of any post of the thread. ** 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; } if( zName==0 ){ webpage_error("Missing \"name=\" query parameter"); } fpid = symbolic_name_to_rid(zName, "f"); if( fpid<=0 ){ webpage_error("Unknown or ambiguous forum id: \"%s\"", zName); } 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; /* 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. */ static int forum_need_moderation(void){ |
︙ | ︙ | |||
947 948 949 950 951 952 953 | iBasis = iInReplyTo; } 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); | | | 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 | iBasis = iInReplyTo; } 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, "SELECT uuid FROM blob, forumpost" " WHERE blob.rid==forumpost.froot" " AND forumpost.fpid=%d", iBasis); if( zG ){ blob_appendf(&x, "G %s\n", zG); fossil_free(zG); } |
︙ | ︙ | |||
1015 1016 1017 1018 1019 1020 1021 | return 1; } } /* ** Paint the form elements for entering a Forum post */ | | | 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 | return 1; } } /* ** Paint the form elements for entering a Forum post */ static void forum_post_widget( const char *zTitle, const char *zMimetype, const char *zContent ){ if( zTitle ){ @ Title: <input type="input" name="title" value="%h(zTitle)" size="50" @ maxlength="125"><br> |
︙ | ︙ | |||
1124 1125 1126 1127 1128 1129 1130 | @ <h1>Preview:</h1> forum_render(zTitle, zMimetype, zContent, "forumEdit", 1); } style_header("New Forum Thread"); @ <form action="%R/forume1" method="POST"> @ <h1>New Thread:</h1> forum_from_line(); | | | 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 | @ <h1>Preview:</h1> forum_render(zTitle, zMimetype, zContent, "forumEdit", 1); } style_header("New Forum Thread"); @ <form action="%R/forume1" method="POST"> @ <h1>New Thread:</h1> forum_from_line(); forum_post_widget(zTitle, zMimetype, zContent); @ <input type="submit" name="preview" value="Preview"> if( P("preview") && !whitespace_only(zContent) ){ @ <input type="submit" name="submit" value="Submit"> }else{ @ <input type="submit" name="submit" value="Submit" disabled> } if( g.perm.Debug ){ |
︙ | ︙ | |||
1201 1202 1203 1204 1205 1206 1207 | "WHERE login=%Q AND cap NOT GLOB '*4*'", zUserToTrust); } cgi_redirectf("%R/forumpost/%S",P("fpid")); return; } if( P("reject") ){ | | | 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 | "WHERE login=%Q AND cap NOT GLOB '*4*'", zUserToTrust); } cgi_redirectf("%R/forumpost/%S",P("fpid")); return; } if( P("reject") ){ char *zParent = db_text(0, "SELECT uuid FROM forumpost, blob" " WHERE forumpost.fpid=%d AND blob.rid=forumpost.firt", fpid ); moderation_disapprove(fpid); if( zParent ){ |
︙ | ︙ | |||
1274 1275 1276 1277 1278 1279 1280 | forum_render(zTitle, zMimetype, zContent,"forumEdit", 1); } @ <h2>Revised Message:</h2> @ <form action="%R/forume2" method="POST"> @ <input type="hidden" name="fpid" value="%h(P("fpid"))"> @ <input type="hidden" name="edit" value="1"> forum_from_line(); | | | 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 | forum_render(zTitle, zMimetype, zContent,"forumEdit", 1); } @ <h2>Revised Message:</h2> @ <form action="%R/forume2" method="POST"> @ <input type="hidden" name="fpid" value="%h(P("fpid"))"> @ <input type="hidden" name="edit" value="1"> forum_from_line(); forum_post_widget(zTitle, zMimetype, zContent); }else{ /* Reply */ char *zDisplayName; zMimetype = PD("mimetype",DEFAULT_FORUM_MIMETYPE); zContent = PDT("content",""); style_header("Reply"); if( pRootPost->zThreadTitle ){ |
︙ | ︙ | |||
1300 1301 1302 1303 1304 1305 1306 | forum_render(0, zMimetype,zContent, "forumEdit", 1); } @ <h2>Enter Reply:</h2> @ <form action="%R/forume2" method="POST"> @ <input type="hidden" name="fpid" value="%h(P("fpid"))"> @ <input type="hidden" name="reply" value="1"> forum_from_line(); | | | 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 | forum_render(0, zMimetype,zContent, "forumEdit", 1); } @ <h2>Enter Reply:</h2> @ <form action="%R/forume2" method="POST"> @ <input type="hidden" name="fpid" value="%h(P("fpid"))"> @ <input type="hidden" name="reply" value="1"> forum_from_line(); forum_post_widget(0, zMimetype, zContent); } if( !isDelete ){ @ <input type="submit" name="preview" value="Preview"> } @ <input type="submit" name="cancel" value="Cancel"> if( (P("preview") && !whitespace_only(zContent)) || isDelete ){ @ <input type="submit" name="submit" value="Submit"> |
︙ | ︙ |
Changes to src/translate.c.
︙ | ︙ | |||
153 154 155 156 157 158 159 | zOut[j] = 0; if( j<=0 && omitline ){ fprintf(out,"\n"); }else{ fprintf(out,"%*s\"%s%s\"\n",indent, "", zOut, zNewline); } }else{ | | | | | | > > > > > > | > > > | | > | | | | | | | | | | > | 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 | zOut[j] = 0; if( j<=0 && omitline ){ fprintf(out,"\n"); }else{ fprintf(out,"%*s\"%s%s\"\n",indent, "", zOut, zNewline); } }else{ /* Otherwise (if the last non-whitespace was not '=') then generate a ** cgi_printf() statement whose format is the text following the '@'. ** Substrings of the form "%C(...)" (where C is any sequence of characters ** other than \000 and '(') will put "%C" in the format and add the ** "(...)" as an argument to the cgi_printf call. Each '*' character ** present in C (max two) causes one more "(...)" sequence to be consumed. ** For example, "%*.*d(4)(2)(1)" converts to "%*.*d" with arguments "4", ** "2", and "1", which will be used as the field width, precision, and ** value, respectively, producing a final formatted result of " 01". */ const char *zNewline = "\\n"; int indent; int nC; int nParam; char c; i++; if( isspace(zLine[i]) ){ i++; } indent = i; for(j=0; zLine[i] && zLine[i]!='\r' && zLine[i]!='\n'; i++){ if( zLine[i]=='\\' && (!zLine[i+1] || zLine[i+1]=='\r' || zLine[i+1]=='\n') ){ zNewline = ""; break; } if( zLine[i]=='"' || zLine[i]=='\\' ){ zOut[j++] = '\\'; } zOut[j++] = zLine[i]; if( zLine[i]!='%' || zLine[i+1]=='%' || zLine[i+1]==0 ) continue; nParam=1; for(nC=1; zLine[i+nC] && zLine[i+nC]!='('; nC++){ if( zLine[i+nC]=='*' && nParam < 3 ) nParam++; } if( zLine[i+nC]!='(' || !isalpha(zLine[i+nC-1]) ) continue; while( --nC ) zOut[j++] = zLine[++i]; do{ zArg[nArg++] = ','; k = 0; i++; if( zLine[i]!='(' ) break; while( (c = zLine[i])!=0 ){ zArg[nArg++] = c; if( c==')' ){ k--; if( k==0 ) break; }else if( c=='(' ){ k++; } i++; } }while( --nParam ); } zOut[j] = 0; if( !inPrint ){ fprintf(out,"%*scgi_printf(\"%s%s\"",indent-2,"", zOut, zNewline); inPrint = 1; }else{ fprintf(out,"\n%*s\"%s%s\"",indent+5, "", zOut, zNewline); |
︙ | ︙ |
Changes to src/util.c.
︙ | ︙ | |||
689 690 691 692 693 694 695 | char zSrc[60]; int nSrc; int i; char z[60]; /* Source characters for the password. Omit characters like "0", "O", ** "1" and "I" that might be easily confused */ | | | 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 | char zSrc[60]; int nSrc; int i; char z[60]; /* Source characters for the password. Omit characters like "0", "O", ** "1" and "I" that might be easily confused */ static const char zAlphabet[] = /* 0 1 2 3 4 5 */ /* 123456789 123456789 123456789 123456789 123456789 123456 */ "23456789abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ"; if( N<8 ) N = 8; else if( N>sizeof(zAlphabet)-2 ) N = sizeof(zAlphabet)-2; nSrc = sizeof(zAlphabet) - 1; |
︙ | ︙ | |||
726 727 728 729 730 731 732 | void test_random_password(void){ int N = 10; if( g.argc>=3 ){ N = atoi(g.argv[2]); } fossil_print("%s\n", fossil_random_password(N)); } | > > > > > > > > > > | 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 | void test_random_password(void){ int N = 10; if( g.argc>=3 ){ N = atoi(g.argv[2]); } fossil_print("%s\n", fossil_random_password(N)); } /* ** Return the number of decimal digits in a nonnegative integer. This is useful ** when formatting text. */ int fossil_num_digits(int n){ return n< 10 ? 1 : n< 100 ? 2 : n< 1000 ? 3 : n< 10000 ? 4 : n< 100000 ? 5 : n< 1000000 ? 6 : n<10000000 ? 7 : n<100000000 ? 8 : n<1000000000 ? 9 : 10; } |