Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch forumpost-locking Excluding Merge-Ins
This is equivalent to a diff from 83928d8a to b370c189
2023-06-10
| ||
09:16 | Add ability to "close" forum posts. ... (check-in: 673dc38f user: stephan tags: trunk) | |
2023-06-07
| ||
12:07 | Initial version of the /setup_forum page. ... (Closed-Leaf check-in: b370c189 user: stephan tags: forumpost-locking) | |
2023-06-06
| ||
19:38 | Add the forum-close-policy boolean config setting. If true, forum moderators may close/re-open forum posts, as well as reply to closed posts. ... (check-in: 162fc1e6 user: stephan tags: forumpost-locking) | |
2023-06-03
| ||
10:27 | Fixed a typo in an error message ... (check-in: f25da6ec user: wyoung tags: trunk) | |
08:59 | Merge trunk into markdown-tagrefs branch and resolve conflict. ... (check-in: fdd3fe21 user: stephan tags: markdown-tagrefs) | |
08:49 | Merge trunk into forumpost-locking branch. ... (check-in: 8e7de26a user: stephan tags: forumpost-locking) | |
2023-06-01
| ||
18:02 | Admin users have a link in /forumthread to show the hash of all artifacts associated with that thread. ... (check-in: 83928d8a user: drh tags: trunk) | |
17:18 | Increase the version number to 2.23 in order to start the next development cycle. ... (check-in: 9f857c2d user: drh tags: trunk) | |
Changes to src/attach.c.
︙ | ︙ | |||
242 243 244 245 246 247 248 | moderation_table_create(); db_multi_exec( "INSERT INTO modreq(objid,attachRid) VALUES(%d,%d);", rid, attachRid ); }else{ rid = content_put(pAttach); | | | 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 | moderation_table_create(); db_multi_exec( "INSERT INTO modreq(objid,attachRid) VALUES(%d,%d);", rid, attachRid ); }else{ rid = content_put(pAttach); db_add_unsent(rid); db_multi_exec("INSERT OR IGNORE INTO unclustered VALUES(%d);", rid); } manifest_crosslink(rid, pAttach, MC_NONE); } /* |
︙ | ︙ |
Changes to src/branch.c.
︙ | ︙ | |||
191 192 193 194 195 196 197 | } } brid = content_put_ex(&branch, 0, 0, 0, isPrivate); if( brid==0 ){ fossil_fatal("trouble committing manifest: %s", g.zErrMsg); } | | | | 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 | } } brid = content_put_ex(&branch, 0, 0, 0, isPrivate); if( brid==0 ){ fossil_fatal("trouble committing manifest: %s", g.zErrMsg); } db_add_unsent(brid); if( manifest_crosslink(brid, &branch, MC_PERMIT_HOOKS)==0 ){ fossil_fatal("%s", g.zErrMsg); } assert( blob_is_reset(&branch) ); content_deltify(rootid, &brid, 1, 0); zUuid = rid_to_uuid(brid); fossil_print("New branch: %s\n", zUuid); if( g.argc==3 ){ fossil_print( "\n" "Note: the local check-out has not been updated to the new\n" " branch. To begin working on the new branch, do this:\n" "\n" |
︙ | ︙ | |||
458 459 460 461 462 463 464 | fossil_fatal("Problem saving new artifact: %s\n%b", g.zErrMsg, &manifest); }else if(manifest_crosslink(newRid, &manifest, 0)==0){ fossil_fatal("Crosslinking error: %s", g.zErrMsg); } fossil_print("Saved new control artifact %z (RID %d).\n", rid_to_uuid(newRid), newRid); | | | 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 | fossil_fatal("Problem saving new artifact: %s\n%b", g.zErrMsg, &manifest); }else if(manifest_crosslink(newRid, &manifest, 0)==0){ fossil_fatal("Crosslinking error: %s", g.zErrMsg); } fossil_print("Saved new control artifact %z (RID %d).\n", rid_to_uuid(newRid), newRid); db_add_unsent(newRid); if(fDryRun){ fossil_print("Dry-run mode: rolling back new artifact.\n"); assert(0!=doRollback); } } db_multi_exec("DROP TABLE brcmdtag"); blob_reset(&manifest); |
︙ | ︙ | |||
717 718 719 720 721 722 723 | " WHERE rid=%d AND tagid=%d", vid, TAG_BRANCH); } branch_prepare_list_query(&q, brFlags, zBrNameGlob, nLimit); while( db_step(&q)==SQLITE_ROW ){ const char *zBr = db_column_text(&q, 0); int isPriv = zCurrent!=0 && db_column_int(&q, 1)==1; int isCur = zCurrent!=0 && fossil_strcmp(zCurrent,zBr)==0; | | | | 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 | " WHERE rid=%d AND tagid=%d", vid, TAG_BRANCH); } branch_prepare_list_query(&q, brFlags, zBrNameGlob, nLimit); while( db_step(&q)==SQLITE_ROW ){ const char *zBr = db_column_text(&q, 0); int isPriv = zCurrent!=0 && db_column_int(&q, 1)==1; int isCur = zCurrent!=0 && fossil_strcmp(zCurrent,zBr)==0; fossil_print("%s%s%s\n", ( (brFlags & BRL_PRIVATE) ? " " : ( isPriv ? "#" : " ") ), (isCur ? "* " : " "), zBr); } db_finalize(&q); }else if( strncmp(zCmd,"new",n)==0 ){ branch_new(); }else if( strncmp(zCmd,"close",5)==0 ){ if(g.argc<4){ |
︙ | ︙ |
Changes to src/checkin.c.
︙ | ︙ | |||
2663 2664 2665 2666 2667 2668 2669 | blob_reset(&content); if( nrid!=rid ){ if( rid>0 ){ content_deltify(rid, &nrid, 1, 0); } db_multi_exec("UPDATE vfile SET mrid=%d, rid=%d, mhash=NULL WHERE id=%d", nrid,nrid,id); | | | 2663 2664 2665 2666 2667 2668 2669 2670 2671 2672 2673 2674 2675 2676 2677 | blob_reset(&content); if( nrid!=rid ){ if( rid>0 ){ content_deltify(rid, &nrid, 1, 0); } db_multi_exec("UPDATE vfile SET mrid=%d, rid=%d, mhash=NULL WHERE id=%d", nrid,nrid,id); db_add_unsent(nrid); } } db_finalize(&q); if( nConflict && !allowConflict ){ fossil_fatal("abort due to unresolved merge conflicts; " "use --allow-conflict to override"); }else if( abortCommit ){ |
︙ | ︙ | |||
2761 2762 2763 2764 2765 2766 2767 | free(zManifestFile); } nvid = content_put(&manifest); if( nvid==0 ){ fossil_fatal("trouble committing manifest: %s", g.zErrMsg); } | | | 2761 2762 2763 2764 2765 2766 2767 2768 2769 2770 2771 2772 2773 2774 2775 | free(zManifestFile); } nvid = content_put(&manifest); if( nvid==0 ){ fossil_fatal("trouble committing manifest: %s", g.zErrMsg); } db_add_unsent(nvid); if( manifest_crosslink(nvid, &manifest, dryRunFlag ? MC_NONE : MC_PERMIT_HOOKS)==0 ){ fossil_fatal("%s", g.zErrMsg); } assert( blob_is_reset(&manifest) ); content_deltify(vid, &nvid, 1, 0); zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", nvid); |
︙ | ︙ |
Changes to src/db.c.
︙ | ︙ | |||
4648 4649 4650 4651 4652 4653 4654 4655 4656 4657 4658 4659 4660 4661 | ** If enabled on a client, new delta manifests are prohibited on ** commits. If enabled on a server, whenever a client attempts ** to obtain a check-in lock during auto-sync, the server will ** send the "pragma avoid-delta-manifests" statement in its reply, ** which will cause the client to avoid generating a delta ** manifest. */ /* ** SETTING: gdiff-command width=40 default=gdiff sensitive ** The value is an external command to run when performing a graphical ** diff. If undefined, text diff will be used. */ /* ** SETTING: gmerge-command width=40 sensitive | > > > > > > > | 4648 4649 4650 4651 4652 4653 4654 4655 4656 4657 4658 4659 4660 4661 4662 4663 4664 4665 4666 4667 4668 | ** If enabled on a client, new delta manifests are prohibited on ** commits. If enabled on a server, whenever a client attempts ** to obtain a check-in lock during auto-sync, the server will ** send the "pragma avoid-delta-manifests" statement in its reply, ** which will cause the client to avoid generating a delta ** manifest. */ /* ** SETTING: forum-close-policy boolean default=off ** If true, forum moderators may close/re-open forum posts, and reply ** to closed posts. If false, only administrators may do so. Note that ** this only affects the forum web UI, not post-closing tags which ** arrive via the command-line or from synchronization with a remote. */ /* ** SETTING: gdiff-command width=40 default=gdiff sensitive ** The value is an external command to run when performing a graphical ** diff. If undefined, text diff will be used. */ /* ** SETTING: gmerge-command width=40 sensitive |
︙ | ︙ | |||
5449 5450 5451 5452 5453 5454 5455 | zRepo = db_fingerprint(atoi(zCkout), 0); rc = fossil_strcmp(zCkout,zRepo)==0; fossil_free(zRepo); } fossil_free(zCkout); return rc; } | > > > > > > > | 5456 5457 5458 5459 5460 5461 5462 5463 5464 5465 5466 5467 5468 5469 | zRepo = db_fingerprint(atoi(zCkout), 0); rc = fossil_strcmp(zCkout,zRepo)==0; fossil_free(zRepo); } fossil_free(zCkout); return rc; } /* ** Adds the given rid to the UNSENT table. */ void db_add_unsent(int rid){ db_multi_exec("INSERT OR IGNORE INTO unsent VALUES(%d)", rid); } |
Changes to src/default.css.
︙ | ︙ | |||
902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 | border: 1px solid black; padding-left: 1ex; padding-right: 1ex; margin-top: 1ex; display: flex; flex-direction: column; } .forum div > form { margin: 0.5em 0; } .forum-post-collapser { /* Common style for the bottom-of-post and right-of-post expand/collapse widgets. */ font-size: 0.8em; padding: 0; border: 1px solid rgba(0, 0, 0, 0.2); | > > > > > > > > > > > > > > > > > > > > > > > > > > > | 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 | border: 1px solid black; padding-left: 1ex; padding-right: 1ex; margin-top: 1ex; display: flex; flex-direction: column; } div.forumClosed { } div.forumClosed > .forumPostBody { opacity: 0.7; } div.forumClosed > .forumPostHdr::before { content: "[CLOSED] "; } /*div.forumClosed > div.forumPostBody { filter: blur(5px); }*/ div.forumpost-closure-warning { margin-top: 1em; margin-bottom: 1em; border-style: solid; padding: 0.25em 0.5em; background: #f4f400bb; /*font-weight: bold;*/ } div.forumpost-closure-warning input[type=submit] { padding: 0.25em; } div.forumpost-single-controls { /* UI controls along the bottom of a single post ** in the thread view. */ } .forum div > form { margin: 0.5em 0; display: inline-block; } .forum-post-collapser { /* Common style for the bottom-of-post and right-of-post expand/collapse widgets. */ font-size: 0.8em; padding: 0; border: 1px solid rgba(0, 0, 0, 0.2); |
︙ | ︙ | |||
999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 | div.forumSel { background-color: #cef; } div.forumObs { color: #bbb; } #capabilitySummary { text-align: center; } #capabilitySummary td { padding-left: 3ex; padding-right: 3ex; | > > > > > > > > > > > > > > > > > > > > | 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 | div.forumSel { background-color: #cef; } div.forumObs { color: #bbb; } div.setup_forum-column { display: flex; flex-direction: column; } body.cpage-setup_forum > .content table { margin-bottom: 1em; } body.cpage-setup_forum > .content table.bordered { border: 1px solid; border-radius: 0.25em; } body.cpage-setup_forum > .content table td, body.cpage-setup_forum > .content table th { text-align: left; } body.cpage-setup_forum table.forum-settings-list > tbody > tr > td { min-width: 2em; } #capabilitySummary { text-align: center; } #capabilitySummary td { padding-left: 3ex; padding-right: 3ex; |
︙ | ︙ |
Changes to src/event.c.
︙ | ︙ | |||
326 327 328 329 330 331 332 | blob_appendf(&event, "U %F\n", login_name()); } blob_appendf(&event, "W %d\n%s\n", strlen(zBody), zBody); md5sum_blob(&event, &cksum); blob_appendf(&event, "Z %b\n", &cksum); blob_reset(&cksum); nrid = content_put(&event); | | | 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 | blob_appendf(&event, "U %F\n", login_name()); } blob_appendf(&event, "W %d\n%s\n", strlen(zBody), zBody); md5sum_blob(&event, &cksum); blob_appendf(&event, "Z %b\n", &cksum); blob_reset(&cksum); nrid = content_put(&event); db_add_unsent(nrid); if( manifest_crosslink(nrid, &event, MC_NONE)==0 ){ db_end_transaction(1); return 0; } assert( blob_is_reset(&event) ); content_deltify(rid, &nrid, 1, 0); db_end_transaction(0); |
︙ | ︙ |
Changes to src/forum.c.
︙ | ︙ | |||
45 46 47 48 49 50 51 52 53 54 55 56 57 58 | 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 */ | > | 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 | 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 */ int iClosed; /* See forum_rid_is_closed() */ }; /* ** A single instance of the following tracks all entries for a thread. */ struct ForumThread { ForumPost *pFirst; /* First post in chronological order */ |
︙ | ︙ | |||
75 76 77 78 79 80 81 82 83 84 85 86 87 88 | " 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){ | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 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 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 | " 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; } /* ** Given a valid forumpost.fpid value, this function returns the first ** fpid in the chain of edits for that forum post, or rid if no prior ** versions are found. */ static int forumpost_head_rid(int rid){ Stmt q; int rcRid = rid; db_prepare(&q, "SELECT fprev FROM forumpost" " WHERE fpid=:rid AND fprev IS NOT NULL"); db_bind_int(&q, ":rid", rid); while( SQLITE_ROW==db_step(&q) ){ rcRid = db_column_int(&q, 0); db_reset(&q); db_bind_int(&q, ":rid", rcRid); } db_finalize(&q); return rcRid; } /* ** Returns true if p, or any parent of p, has a non-zero iClosed ** value. Returns 0 if !p. For an edited chain of post, the tag is ** checked on the pEditHead entry, to simplify subsequent unlocking of ** the post. ** ** If bCheckIrt is true then p's thread in-response-to parents are ** checked (recursively) for closure, else only p is checked. */ static int forumpost_is_closed(ForumPost *p, int bCheckIrt){ while(p){ if( p->pEditHead ) p = p->pEditHead; if( p->iClosed || !bCheckIrt ) return p->iClosed; p = p->pIrt; } return 0; } /* ** Given a forum post RID, this function returns true if that post has ** (or inherits) an active "closed" tag. If bCheckIrt is true then ** the post to which the given post responds is also checked ** (recursively), else they are not. When checking in-response-to ** posts, the first one which is closed ends the search. ** ** Note that this function checks _exactly_ the given rid, whereas ** forum post closure/re-opening is always applied to the head of an ** edit chain so that we get consistent implied locking beheavior for ** later versions and responses to arbitrary versions in the ** chain. Even so, the "closed" tag is applied as a propagating tag ** so will apply to all edits in a given chain. ** ** The return value is one of: ** ** - 0 if no "closed" tag is found. ** ** - The tagxref.rowid of the tagxref entry for the closure if rid is ** the forum post to which the closure applies. ** ** - (-tagxref.rowid) if the given rid inherits a "closed" tag from an ** IRT forum post. */ static int forum_rid_is_closed(int rid, int bCheckIrt){ static Stmt qIrt = empty_Stmt_m; int rc = 0, i = 0; /* TODO: this can probably be turned into a CTE by someone with ** superior SQL-fu. */ for( ; rid; i++ ){ rc = rid_has_active_tag_name(rid, "closed"); if( rc || !bCheckIrt ) break; else if( !qIrt.pStmt ) { db_static_prepare(&qIrt, "SELECT firt FROM forumpost " "WHERE fpid=$fpid ORDER BY fmtime DESC" ); } db_bind_int(&qIrt, "$fpid", rid); rid = SQLITE_ROW==db_step(&qIrt) ? db_column_int(&qIrt, 0) : 0; db_reset(&qIrt); } return i ? -rc : rc; } /* ** Closes or re-opens the given forum RID via addition of a new ** control artifact into the repository. In order to provide ** consistent behavior for implied closing of responses and later ** versions, it always acts on the first version of the given forum ** post, walking the forumpost.fprev values to find the head of the ** chain. ** ** If doClose is true then a propagating "closed" tag is added, except ** as noted below, with the given optional zReason string as the tag's ** value. If doClose is false then any active "closed" tag on frid is ** cancelled, except as noted below. zReason is ignored if doClose is ** false or if zReason is NULL or starts with a NUL byte. ** ** This function only adds a "closed" tag if forum_rid_is_closed() ** indicates that frid's head is not closed. If a parent post is ** already closed, no tag is added. Similarly, it will only remove a ** "closed" tag from a post which has its own "closed" tag, and will ** not remove an inherited one from a parent post. ** ** If doClose is true and frid is closed (directly or inherited), this ** is a no-op. Likewise, if doClose is false and frid itself is not ** closed (not accounting for an inherited closed tag), this is a ** no-op. ** ** Returns true if it actually creates a new tag, else false. Fails ** fatally on error. If it returns true then any ForumPost::iClosed ** values from previously loaded posts are invalidated if they refer ** to the amended post or a response to it. ** ** Sidebars: ** ** - Unless the caller has a transaction open, via ** db_begin_transaction(), there is a very tiny race condition ** window during which the caller's idea of whether or not the forum ** post is closed may differ from the current repository state. ** ** - This routine assumes that frid really does refer to a forum post. ** ** - This routine assumes that frid is not private or pending ** moderation. ** ** - Closure of a forum post requires a propagating "closed" tag to ** account for how edits of posts are handled. This differs from ** closure of a branch, where a non-propagating tag is used. */ static int forumpost_close(int frid, int doClose, const char *zReason){ Blob artifact = BLOB_INITIALIZER; /* Output artifact */ Blob cksum = BLOB_INITIALIZER; /* Z-card */ int iClosed; /* true if frid is closed */ int trid; /* RID of new control artifact */ char *zUuid; /* UUID of head version of post */ db_begin_transaction(); frid = forumpost_head_rid(frid); iClosed = forum_rid_is_closed(frid, 1); if( (iClosed && doClose /* Already closed, noting that in the case of (iClosed<0), it's ** actually a parent which is closed. */) || (iClosed<=0 && !doClose /* This entry is not closed, but a parent post may be. */) ){ db_end_transaction(0); return 0; } if( doClose==0 || (zReason && !zReason[0]) ){ zReason = 0; } zUuid = rid_to_uuid(frid); blob_appendf(&artifact, "D %z\n", date_in_standard_format( "now" )); blob_appendf(&artifact, "T %cclosed %s%s%F\n", doClose ? '*' : '-', zUuid, zReason ? " " : "", zReason ? zReason : ""); blob_appendf(&artifact, "U %F\n", login_name()); md5sum_blob(&artifact, &cksum); blob_appendf(&artifact, "Z %b\n", &cksum); blob_reset(&cksum); trid = content_put_ex(&artifact, 0, 0, 0, 0); if( trid==0 ){ fossil_fatal("Error saving tag artifact: %s", g.zErrMsg); } if( manifest_crosslink(trid, &artifact, MC_NONE /*MC_PERMIT_HOOKS?*/)==0 ){ fossil_fatal("%s", g.zErrMsg); } assert( blob_is_reset(&artifact) ); db_add_unsent(trid); admin_log("%s forum post %S", doClose ? "Close" : "Re-open", zUuid); fossil_free(zUuid); /* Potential TODO: if (iClosed>0) then we could find the initial tag ** artifact and content_deltify(thatRid,&trid,1,0). Given the tiny ** size of these artifacts, however, that would save little space, ** if any. */ db_end_transaction(0); return 1; } /* ** Returns true if the forum-close-policy setting is true, else false, ** caching the result for subsequent calls. */ static int forumpost_close_policy(void){ static int closePolicy = -99; if( closePolicy==-99 ){ closePolicy = db_get_boolean("forum-close-policy",0)>0; } return closePolicy; } /* ** Returns 1 if the current user is an admin, -1 if the current user ** is a forum moderator and the forum-close-policy setting is true, ** else returns 0. The value is cached for subsequent calls. */ static int forumpost_may_close(void){ static int permClose = -99; if( permClose!=-99 ){ return permClose; }else if( g.perm.Admin ){ return permClose = 1; }else if( g.perm.ModForum ){ return permClose = forumpost_close_policy()>0 ? -1 : 0; }else{ return permClose = 0; } } /* ** If iClosed is true and the current user forumpost-close privileges, ** this renders either a checkbox to unlock forum post fpid (if ** iClosed>0) or a SPAN.warning element that the given post inherits ** the CLOSED status from a parent post (if iClosed<0). If neither of ** the initial conditions is true, this is a no-op. */ static void forumpost_emit_closed_state(int fpid, int iClosed){ const char *zCommon; int iHead = forumpost_head_rid(fpid); const int permClose = forumpost_may_close(); zCommon = forumpost_close_policy()==0 ? "Admins may close or re-open posts, or respond to closed posts." : "Admins or moderators " "may close or re-open posts, or respond to closed posts."; /*@ forumpost_emit_closed_state(%d(fpid), %d(iClosed))<br/>*/ if( iHead != fpid ){ iClosed = forum_rid_is_closed(iHead, 1); /*@ forumpost_emit_closed_state() %d(iHead), %d(iClosed)*/ } if( iClosed<0 ){ @ <div class="warning forumpost-closure-warning">\ @ This post is CLOSED via a parent post. %s(zCommon)\ @ </div> return; } else if( iClosed==0 ){ if( permClose==0 ) return; @ <div class="warning forumpost-closure-warning"> @ <form method="post" action="%R/forumpost_close"> @ <input type="hidden" name="fpid" value="%z(rid_to_uuid(iHead))" /> @ <input type="submit" value="CLOSE this post and its responses" /> @ <span>%s(zCommon)</span> @ <span>This does NOT save any pending changes in @ the editor!</span> @ </form></div> return; } assert( iClosed>0 ); /* Only show the "unlock" option on a post which is actually ** closed, not on a post which inherits that state. */ @ <div class="warning forumpost-closure-warning">\ @ This post is CLOSED. %s(zCommon) if( permClose ){ @ <form method="post" action="%R/forumpost_reopen"> @ <input type="hidden" name="fpid" value="%z(rid_to_uuid(iHead))" /> @ <input type="submit" value="Re-open this post and its responses" /> @ <span>This does NOT save any pending changes in @ the editor!</span> @ </form> } @ </div> } /* ** Emits a warning that the current forum post is CLOSED and can only ** be edited or responded to by an administrator. */ static void forumpost_error_closed(void){ @ <div class='error'>This (sub)thread is CLOSED and can only be @ edited or replied to by an admin user.</div> } /* ** Delete a complete ForumThread and all its entries. */ static void forumthread_delete(ForumThread *pThread){ ForumPost *pPost, *pNext; for(pPost=pThread->pFirst; pPost; pPost = pNext){ |
︙ | ︙ | |||
213 214 215 216 217 218 219 220 221 222 223 224 225 226 | 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; | > > > | 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 | pPost->pEditPrev = p; pPost->pEditHead = p->pEditHead ? p->pEditHead : p; for(; p; p=p->pEditPrev ){ p->nEdit = pPost->nEdit; p->pEditTail = pPost; } } pPost->iClosed = forum_rid_is_closed(pPost->pEditHead ? pPost->pEditHead->fpid : pPost->fpid, 1); } db_finalize(&q); if( computeHierarchy ){ /* Compute the hierarchical display order */ pPost = pThread->pFirst; pPost->nIndent = 1; |
︙ | ︙ | |||
298 299 300 301 302 303 304 | 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 */ | | | > > | | > > > > | 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 | 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 closed fpid pIrt pEditPrev pEditTail hash\n"); for(p=pThread->pFirst; p; p=p->pNext){ fossil_print("%4d %4d %7d %9d %9d %9d %9d %8.8s\n", p->sid, p->rev, p->iClosed, 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", p->fpid, p->pEditTail->fpid); }else{ fossil_print("%d", p->fpid); } if( p->iClosed ){ fossil_print(" [closed%s]", p->iClosed<0 ? " via parent" : ""); } fossil_print("\n"); } forumthread_delete(pThread); } /* ** WEBPAGE: forumthreadhashlist ** |
︙ | ︙ | |||
509 510 511 512 513 514 515 516 517 518 519 520 | char *zEditorName; /* Name of user who provided the current edit */ 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; | > | > | | | | 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 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 | char *zEditorName; /* Name of user who provided the current edit */ 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 */ int iClosed; /* True if (sub)thread is closed */ 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; iClosed = forumpost_is_closed(p, 1); /* 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(iClosed ? " forumClosed" : "")\ @ %s(p->pEditTail ? " forumObs" : "")' \ if( iIndent && iIndentScale ){ @ style='margin-left:%d(iIndent*iIndentScale)ex;'> }else{ @ > } /* If this is the first post (or an edit thereof), emit the thread title. */ if( pManifest->zThreadTitle ){ @ <h1>%h(pManifest->zThreadTitle)</h1> } /* Begin emitting the header line. The forum of the title ** varies depending on whether: ** * The post is unedited ** * The post was last edited by the original author ** * The post was last edited by a different person */ if( p->pEditHead ){ zDate = db_text(0, "SELECT datetime(%.17g,toLocal())", p->pEditHead->rDate); }else{ zPosterName = forum_post_display_name(p, pManifest); zEditorName = zPosterName; } zDate = db_text(0, "SELECT datetime(%.17g,toLocal())", p->rDate); if( p->pEditPrev ){ zPosterName = forum_post_display_name(p->pEditHead, 0); zEditorName = forum_post_display_name(p, pManifest); zHist = bHist ? "" : zQuery[0]==0 ? "?hist" : "&hist"; @ <h3 class='forumPostHdr'>(%d(p->sid)\ @ .%0*d(fossil_num_digits(p->nEdit))(p->rev)) if( fossil_strcmp(zPosterName, zEditorName)==0 ){ @ By %s(zPosterName) on %h(zDate) edited from \ @ %z(href("%R/forumpost/%S%s%s",p->pEditPrev->zUuid,zQuery,zHist))\ @ %d(p->sid).%0*d(fossil_num_digits(p->nEdit))(p->pEditPrev->rev)</a> }else{ @ Originally by %s(zPosterName) \ @ with edits by %s(zEditorName) on %h(zDate) from \ @ %z(href("%R/forumpost/%S%s%s",p->pEditPrev->zUuid,zQuery,zHist))\ @ %d(p->sid).%0*d(fossil_num_digits(p->nEdit))(p->pEditPrev->rev)</a> } }else{ zPosterName = forum_post_display_name(p, pManifest); @ <h3 class='forumPostHdr'>(%d(p->sid)) @ By %s(zPosterName) on %h(zDate) } fossil_free(zDate); /* If debugging is enabled, link to the artifact page. */ if( g.perm.Debug ){ |
︙ | ︙ | |||
629 630 631 632 633 634 635 | } /* 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 ){ | > | | > > > > | | | > > | > | > > > > > > > > > | 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 | } /* 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 class="forumpost-single-controls">\ @ <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. Closed threads can only be edited or replied to ** if forumpost_may_close() is true but a user may delete ** their own posts even if they are closed. */ if( forumpost_may_close() || !iClosed ){ @ <input type="submit" name="reply" value="Reply"> if( g.perm.Admin || (bSameUser && !iClosed) ){ @ <input type="submit" name="edit" value="Edit"> } if( g.perm.Admin || bSameUser ){ @ <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> if( bSelect && forumpost_may_close() && iClosed>=0 ){ int iHead = forumpost_head_rid(p->fpid); @ <form method="post" \ @ action='%R/forumpost_%s(iClosed > 0 ? "reopen" : "close")'> @ <input type="hidden" name="fpid" value="%z(rid_to_uuid(iHead))" /> @ <input type="submit" value='%s(iClosed ? "Re-open" : "Close")' /> @ </form> } @ </div> } @ </div> } /* Clean up. */ manifest_destroy(pManifest); } |
︙ | ︙ | |||
1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 | char *zG; int iBasis; Blob x, cksum, formatCheck, errMsg; Manifest *pPost; int nContent = zContent ? (int)strlen(zContent) : 0; schema_forum(); if( iEdit==0 && whitespace_only(zContent) ){ return 0; } if( iInReplyTo==0 && iEdit>0 ){ iBasis = iEdit; iInReplyTo = db_int(0, "SELECT firt FROM forumpost WHERE fpid=%d", iEdit); }else{ | > > > > > | 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 | char *zG; int iBasis; Blob x, cksum, formatCheck, errMsg; Manifest *pPost; int nContent = zContent ? (int)strlen(zContent) : 0; schema_forum(); if( !g.perm.Admin && (iEdit || iInReplyTo) && forum_rid_is_closed(iEdit ? iEdit : iInReplyTo, 1) ){ forumpost_error_closed(); return 0; } if( iEdit==0 && whitespace_only(zContent) ){ return 0; } if( iInReplyTo==0 && iEdit>0 ){ iBasis = iEdit; iInReplyTo = db_int(0, "SELECT firt FROM forumpost WHERE fpid=%d", iEdit); }else{ |
︙ | ︙ | |||
1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 | @ maxlength="125"><br> } @ %z(href("%R/markup_help"))Markup style</a>: mimetype_option_menu(zMimetype, "mimetype"); @ <br><textarea aria-label="Content:" name="content" class="wikiedit" \ @ cols="80" rows="25" wrap="virtual">%h(zContent)</textarea><br> } /* ** WEBPAGE: forumnew ** WEBPAGE: forumedit ** ** Start a new thread on the forum or reply to an existing thread. ** But first prompt to see if the user would like to log in. */ void forum_page_init(void){ int isEdit; char *zGoto; login_check_credentials(); if( !g.perm.WrForum ){ login_needed(g.anon.WrForum); return; } if( sqlite3_strglob("*edit*", g.zPath)==0 ){ zGoto = mprintf("forume2?fpid=%S",PD("fpid","")); | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 | @ maxlength="125"><br> } @ %z(href("%R/markup_help"))Markup style</a>: mimetype_option_menu(zMimetype, "mimetype"); @ <br><textarea aria-label="Content:" name="content" class="wikiedit" \ @ cols="80" rows="25" wrap="virtual">%h(zContent)</textarea><br> } /* ** WEBPAGE: forumpost_close hidden ** WEBPAGE: forumpost_reopen hidden ** ** fpid=X Hash of the post to be edited. REQUIRED ** reason=X Optional reason for closure. ** ** Closes or re-opens the given forum post, within the bounds of the ** API for forumpost_close(). After (perhaps) modifying the "closed" ** status of the given thread, it redirects to that post's thread ** view. Requires admin privileges. */ void forum_page_close(void){ const char *zFpid = PD("fpid",""); const char *zReason = 0; int fClose; int fpid; login_check_credentials(); if( forumpost_may_close()==0 ){ login_needed(g.anon.Admin); return; } fpid = symbolic_name_to_rid(zFpid, "f"); if( fpid<=0 ){ webpage_error("Missing or invalid fpid query parameter"); } fClose = sqlite3_strglob("*_close*", g.zPath)==0; if( fClose ) zReason = PD("reason",0); forumpost_close(fpid, fClose, zReason); cgi_redirectf("%R/forumpost/%S",zFpid); return; } /* ** WEBPAGE: forumnew ** WEBPAGE: forumedit ** ** Start a new thread on the forum or reply to an existing thread. ** But first prompt to see if the user would like to log in. */ void forum_page_init(void){ int isEdit; char *zGoto; login_check_credentials(); if( !g.perm.WrForum ){ login_needed(g.anon.WrForum); return; } if( sqlite3_strglob("*edit*", g.zPath)==0 ){ zGoto = mprintf("forume2?fpid=%S",PD("fpid","")); |
︙ | ︙ | |||
1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 | const char *zMimetype = 0; const char *zContent = 0; const char *zTitle = 0; char *zDate = 0; const char *zFpid = PD("fpid",""); int isCsrfSafe; int isDelete = 0; int bSameUser; /* True if author is also the reader */ int bPrivate; /* True if post is private (not yet moderated) */ login_check_credentials(); if( !g.perm.WrForum ){ login_needed(g.anon.WrForum); return; } fpid = symbolic_name_to_rid(zFpid, "f"); if( fpid<=0 || (pPost = manifest_get(fpid, CFTYPE_FORUM, 0))==0 ){ webpage_error("Missing or invalid fpid query parameter"); } froot = db_int(0, "SELECT froot FROM forumpost WHERE fpid=%d", fpid); if( froot==0 || (pRootPost = manifest_get(froot, CFTYPE_FORUM, 0))==0 ){ webpage_error("fpid does not appear to be a forum post: \"%d\"", fpid); } if( P("cancel") ){ | > > | > > | 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 | const char *zMimetype = 0; const char *zContent = 0; const char *zTitle = 0; char *zDate = 0; const char *zFpid = PD("fpid",""); int isCsrfSafe; int isDelete = 0; int iClosed = 0; int bSameUser; /* True if author is also the reader */ int bPreview; /* True in preview mode. */ int bPrivate; /* True if post is private (not yet moderated) */ login_check_credentials(); if( !g.perm.WrForum ){ login_needed(g.anon.WrForum); return; } fpid = symbolic_name_to_rid(zFpid, "f"); if( fpid<=0 || (pPost = manifest_get(fpid, CFTYPE_FORUM, 0))==0 ){ webpage_error("Missing or invalid fpid query parameter"); } froot = db_int(0, "SELECT froot FROM forumpost WHERE fpid=%d", fpid); if( froot==0 || (pRootPost = manifest_get(froot, CFTYPE_FORUM, 0))==0 ){ webpage_error("fpid does not appear to be a forum post: \"%d\"", fpid); } if( P("cancel") ){ cgi_redirectf("%R/forumpost/%S",zFpid); return; } bPreview = P("preview")!=0; iClosed = forum_rid_is_closed(fpid, 1); isCsrfSafe = cgi_csrf_safe(1); bPrivate = content_is_private(fpid); bSameUser = login_is_individual() && fossil_strcmp(pPost->zUser, g.zLogin)==0; if( isCsrfSafe && (g.perm.ModForum || (bPrivate && bSameUser)) ){ if( g.perm.ModForum && P("approve") ){ const char *zUserToTrust; |
︙ | ︙ | |||
1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 | zMimetype = "text/x-fossil-wiki"; zContent = ""; if( pPost->zThreadTitle ) zTitle = ""; style_header("Delete %s", zTitle ? "Post" : "Reply"); @ <h1>Original Post:</h1> forum_render(pPost->zThreadTitle, pPost->zMimetype, pPost->zWiki, "forumEdit", 1); @ <h1>Change Into:</h1> forum_render(zTitle, zMimetype, zContent,"forumEdit", 1); @ <form action="%R/forume2" method="POST"> @ <input type="hidden" name="fpid" value="%h(P("fpid"))"> @ <input type="hidden" name="nullout" value="1"> @ <input type="hidden" name="mimetype" value="%h(zMimetype)"> @ <input type="hidden" name="content" value="%h(zContent)"> | > | 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 | zMimetype = "text/x-fossil-wiki"; zContent = ""; if( pPost->zThreadTitle ) zTitle = ""; style_header("Delete %s", zTitle ? "Post" : "Reply"); @ <h1>Original Post:</h1> forum_render(pPost->zThreadTitle, pPost->zMimetype, pPost->zWiki, "forumEdit", 1); forumpost_emit_closed_state(fpid, iClosed); @ <h1>Change Into:</h1> forum_render(zTitle, zMimetype, zContent,"forumEdit", 1); @ <form action="%R/forume2" method="POST"> @ <input type="hidden" name="fpid" value="%h(P("fpid"))"> @ <input type="hidden" name="nullout" value="1"> @ <input type="hidden" name="mimetype" value="%h(zMimetype)"> @ <input type="hidden" name="content" value="%h(zContent)"> |
︙ | ︙ | |||
1398 1399 1400 1401 1402 1403 1404 | if( zTitle==0 && pPost->zThreadTitle!=0 ){ zTitle = fossil_strdup(pPost->zThreadTitle); } style_header("Edit %s", zTitle ? "Post" : "Reply"); @ <h2>Original Post:</h2> forum_render(pPost->zThreadTitle, pPost->zMimetype, pPost->zWiki, "forumEdit", 1); | | | 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 | if( zTitle==0 && pPost->zThreadTitle!=0 ){ zTitle = fossil_strdup(pPost->zThreadTitle); } style_header("Edit %s", zTitle ? "Post" : "Reply"); @ <h2>Original Post:</h2> forum_render(pPost->zThreadTitle, pPost->zMimetype, pPost->zWiki, "forumEdit", 1); if( bPreview ){ @ <h2>Preview of Edited Post:</h2> 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"> |
︙ | ︙ | |||
1427 1428 1429 1430 1431 1432 1433 | @ </h2> zDate = db_text(0, "SELECT datetime(%.17g,toLocal())", pPost->rDate); zDisplayName = display_name_from_login(pPost->zUser); @ <h3 class='forumPostHdr'>By %s(zDisplayName) on %h(zDate)</h3> fossil_free(zDisplayName); fossil_free(zDate); forum_render(0, pPost->zMimetype, pPost->zWiki, "forumEdit", 1); | | | > | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 | @ </h2> zDate = db_text(0, "SELECT datetime(%.17g,toLocal())", pPost->rDate); zDisplayName = display_name_from_login(pPost->zUser); @ <h3 class='forumPostHdr'>By %s(zDisplayName) on %h(zDate)</h3> fossil_free(zDisplayName); fossil_free(zDate); forum_render(0, pPost->zMimetype, pPost->zWiki, "forumEdit", 1); if( bPreview && !whitespace_only(zContent) ){ @ <h2>Preview:</h2> 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( (bPreview && !whitespace_only(zContent)) || isDelete ){ if( !iClosed || g.perm.Admin ) { @ <input type="submit" name="submit" value="Submit"> } } forum_render_debug_options(); @ </form> forum_emit_js(); forumpost_emit_closed_state(fpid, iClosed); style_finish_page(); } /* ** WEBPAGE: setup_forum ** ** Forum configuration and metrics. */ void forum_setup(void){ /* boolean config settings specific to the forum. */ const char * zSettingsBool[] = { "forum-close-policy", NULL /* sentinel entry */ }; login_check_credentials(); if( !g.perm.Setup ){ login_needed(g.anon.Setup); return; } style_set_current_feature("forum"); style_header("Forum Setup"); @ <h2>Metrics</h2> { int nPosts = db_int(0, "SELECT COUNT(*) FROM event WHERE type='f'"); @ <p><a href='%R/forum'>Forum posts</a>: @ <a href='%R/timeline?y=f'>%d(nPosts)</a></p> } @ <h2>Supervisors</h2> @ <p>Users with capabilities 's', 'a', or '6'.</p> { Stmt q = empty_Stmt; int nRows = 0; db_prepare(&q, "SELECT uid, login, cap FROM user " "WHERE cap GLOB '*[as6]*' ORDER BY login"); @ <table class='bordered'> @ <thead><tr><th>User</th><th>Capabilities</th></tr></thead> @ <tbody> while( SQLITE_ROW==db_step(&q) ){ const int iUid = db_column_int(&q, 0); const char *zUser = db_column_text(&q, 1); const char *zCap = db_column_text(&q, 2); ++nRows; @ <tr> @ <td><a href='%R/setup_uedit?id=%d(iUid)'>%h(zUser)</a></td> @ <td>(%h(zCap))</td> @ </tr> } db_finalize(&q); @</tbody></table> if( 0==nRows ){ @ No supervisors }else{ @ %d(nRows) supervisor(s) } } @ <h2>Moderators</h2> @ <p>Users with capability '5'.</p> { Stmt q = empty_Stmt; int nRows = 0; db_prepare(&q, "SELECT uid, login, cap FROM user " "WHERE cap GLOB '*5*' ORDER BY login"); @ <table class='bordered'> @ <thead><tr><th>User</th><th>Capabilities</th></tr></thead> @ <tbody> while( SQLITE_ROW==db_step(&q) ){ const int iUid = db_column_int(&q, 0); const char *zUser = db_column_text(&q, 1); const char *zCap = db_column_text(&q, 2); ++nRows; @ <tr> @ <td><a href='%R/setup_uedit?id=%d(iUid)'>%h(zUser)</a></td> @ <td>(%h(zCap))</td> @ </tr> } db_finalize(&q); @ </tbody></table> if( 0==nRows ){ @ No non-supervisor moderators }else{ @ %d(nRows) moderator(s) } } @ <h2>Settings</h2> @ <p>Configuration settings specific to the forum.</p> if( P("submit") && cgi_csrf_safe(1) ){ int i = 0; const char *zSetting; login_verify_csrf_secret(); db_begin_transaction(); while( (zSetting = zSettingsBool[i++]) ){ const char *z = P(zSetting); if( !z || !z[0] ) z = "off"; db_set(zSetting/*works-like:"x"*/, z, 0); } db_end_transaction(0); @ <p><em>Settings saved.</em></p> } { int i = 0; const char *zSetting; @ <form action="%R/setup_forum" method="post"> login_insert_csrf_secret(); @ <table class='forum-settings-list'><tbody> while( (zSetting = zSettingsBool[i++]) ){ @ <tr><td> onoff_attribute("", zSetting, zSetting/*works-like:"x"*/, 0, 0); @ </td><td> @ <a href='%R/help?cmd=%h(zSetting)'>%h(zSetting)</a> @ </td></tr> } @ </tbody></table> @ <input type='submit' name='submit' value='Apply changes'> @ </form> } style_finish_page(); } /* ** WEBPAGE: forummain ** WEBPAGE: forum ** |
︙ | ︙ |
Changes to src/json_branch.c.
︙ | ︙ | |||
291 292 293 294 295 296 297 | md5sum_blob(&branch, &mcksum); blob_appendf(&branch, "Z %b\n", &mcksum); brid = content_put_ex(&branch, 0, 0, 0, zOpt->isPrivate); if( brid==0 ){ fossil_panic("Problem committing manifest: %s", g.zErrMsg); } | | | 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 | md5sum_blob(&branch, &mcksum); blob_appendf(&branch, "Z %b\n", &mcksum); brid = content_put_ex(&branch, 0, 0, 0, zOpt->isPrivate); if( brid==0 ){ fossil_panic("Problem committing manifest: %s", g.zErrMsg); } db_add_unsent(brid); if( manifest_crosslink(brid, &branch, MC_PERMIT_HOOKS)==0 ){ fossil_panic("%s", g.zErrMsg); } assert( blob_is_reset(&branch) ); content_deltify(rootid, &brid, 1, 0); if( zNewRid ){ *zNewRid = brid; |
︙ | ︙ |
Changes to src/setup.c.
︙ | ︙ | |||
128 129 130 131 132 133 134 135 136 137 138 139 140 141 | "Configure the trouble-ticketing system for this repository"); setup_menu_entry("Wiki", "setup_wiki", "Configure the wiki for this repository"); setup_menu_entry("Interwiki Map", "intermap", "Mapping keywords for interwiki links"); setup_menu_entry("Chat", "setup_chat", "Configure the chatroom"); } setup_menu_entry("Search","srchsetup", "Configure the built-in search engine"); setup_menu_entry("URL Aliases", "waliassetup", "Configure URL aliases"); if( setup_user ){ setup_menu_entry("Notification", "setup_notification", | > > | 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 | "Configure the trouble-ticketing system for this repository"); setup_menu_entry("Wiki", "setup_wiki", "Configure the wiki for this repository"); setup_menu_entry("Interwiki Map", "intermap", "Mapping keywords for interwiki links"); setup_menu_entry("Chat", "setup_chat", "Configure the chatroom"); setup_menu_entry("Forum", "setup_forum", "Forum config and metrics"); } setup_menu_entry("Search","srchsetup", "Configure the built-in search engine"); setup_menu_entry("URL Aliases", "waliassetup", "Configure URL aliases"); if( setup_user ){ setup_menu_entry("Notification", "setup_notification", |
︙ | ︙ | |||
1970 1971 1972 1973 1974 1975 1976 | int prevx = ofst - limit; if( prevx<0 ) prevx = 0; @ <p><a href="admin_log?n=%d(limit)&x=%d(prevx)">[Newer]</a></p> } db_prepare(&stLog, "SELECT datetime(time,'unixepoch'), who, page, what " "FROM admin_log " | | | 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986 | int prevx = ofst - limit; if( prevx<0 ) prevx = 0; @ <p><a href="admin_log?n=%d(limit)&x=%d(prevx)">[Newer]</a></p> } db_prepare(&stLog, "SELECT datetime(time,'unixepoch'), who, page, what " "FROM admin_log " "ORDER BY time DESC, rowid DESC"); style_table_sorter(); @ <table class="sortable adminLogTable" width="100%%" \ @ data-column-types='Tttx' data-init-sort='1'> @ <thead> @ <th>Time</th> @ <th>User</th> @ <th>Page</th> |
︙ | ︙ |
Changes to src/tag.c.
︙ | ︙ | |||
901 902 903 904 905 906 907 | "SELECT tag.tagid FROM tagxref, tag" " WHERE tagxref.rid=%d AND tagtype>0 " " AND tag.tagid=%d" " AND tagxref.tagid=tag.tagid", rid, tagId ); } | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 | "SELECT tag.tagid FROM tagxref, tag" " WHERE tagxref.rid=%d AND tagtype>0 " " AND tag.tagid=%d" " AND tagxref.tagid=tag.tagid", rid, tagId ); } /* ** Returns tagxref.rowid if the given blob.rid has a tagxref.rid entry ** of an active (non-cancelled) tag matching the given rid and tag ** name string, else returns 0. Note that this function does not ** distinguish between a non-existent tag and a cancelled tag. ** ** Design note: the return value is the tagxref.rowid because that ** gives us an easy way to fetch the value of the tag later on, if ** needed. */ int rid_has_active_tag_name(int rid, const char *zTagName){ static Stmt q = empty_Stmt_m; int rc; assert( 0 != zTagName ); if( !q.pStmt ){ db_static_prepare(&q, "SELECT x.rowid FROM tagxref x, tag t" " WHERE x.rid=$rid AND x.tagtype>0 " " AND x.tagid=t.tagid" " AND t.tagname=$tagname" ); } db_bind_int(&q, "$rid", rid); db_bind_text(&q, "$tagname", zTagName); rc = (SQLITE_ROW==db_step(&q)) ? db_column_int(&q, 0) : 0; db_reset(&q); return rc; } |
Changes to src/tkt.c.
︙ | ︙ | |||
862 863 864 865 866 867 868 | if( needMod ){ moderation_table_create(); db_multi_exec( "INSERT INTO modreq(objid, tktid) VALUES(%d,%Q)", rid, zTktId ); }else{ | | | 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 | if( needMod ){ moderation_table_create(); db_multi_exec( "INSERT INTO modreq(objid, tktid) VALUES(%d,%Q)", rid, zTktId ); }else{ db_add_unsent(rid); db_multi_exec("INSERT OR IGNORE INTO unclustered VALUES(%d);", rid); } result = (manifest_crosslink(rid, pTicket, MC_NONE)==0); assert( blob_is_reset(pTicket) ); if( !result ){ result = manifest_crosslink_end(MC_PERMIT_HOOKS); }else{ |
︙ | ︙ |
Changes to src/wiki.c.
︙ | ︙ | |||
633 634 635 636 637 638 639 | nrid = content_put_ex(pWiki, 0, 0, 0, 0); if( parent ) content_deltify(parent, &nrid, 1, 0); }else{ nrid = content_put_ex(pWiki, 0, 0, 0, 1); moderation_table_create(); db_multi_exec("INSERT INTO modreq(objid) VALUES(%d)", nrid); } | | | 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 | nrid = content_put_ex(pWiki, 0, 0, 0, 0); if( parent ) content_deltify(parent, &nrid, 1, 0); }else{ nrid = content_put_ex(pWiki, 0, 0, 0, 1); moderation_table_create(); db_multi_exec("INSERT INTO modreq(objid) VALUES(%d)", nrid); } db_add_unsent(nrid); db_multi_exec("INSERT OR IGNORE INTO unclustered VALUES(%d);", nrid); manifest_crosslink(nrid, pWiki, MC_NONE); if( login_is_individual() ){ alert_user_contact(login_name()); } return nrid; } |
︙ | ︙ |