Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Fix the mimetype selector. Improved styling of the forum display. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | forum-brainstorm-1 |
Files: | files | file ages | folders |
SHA3-256: |
837b1cb59b580a108bc3033013cb162b |
User & Date: | drh 2018-06-20 01:35:44.413 |
Context
2018-06-20
| ||
18:47 | Merge the speculative Forum changes. This is because I need the enhancements to the user capabilities in order to add a new capability for Email Notifiation. The Forum logic itself is not ready, and is subject to change and removal. But it is well isolated and shouldn't hurt anything if it hangs out on trunk for a while. ... (check-in: 9a2e5f47 user: drh tags: trunk) | |
01:35 | Fix the mimetype selector. Improved styling of the forum display. ... (Closed-Leaf check-in: 837b1cb5 user: drh tags: forum-brainstorm-1) | |
2018-06-16
| ||
15:08 | Fix minor issues with Forum editing. ... (check-in: c626d1c0 user: drh tags: forum-brainstorm-1) | |
Changes
Changes to src/default_css.txt.
︙ | ︙ | |||
630 631 632 633 634 635 636 | } table.label-value th { vertical-align: top; text-align: right; padding: 0.2ex 1ex; } table.forum_post { | | | | | > > > > | | > > > > > > > > > | 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 | } table.label-value th { vertical-align: top; text-align: right; padding: 0.2ex 1ex; } table.forum_post { margin-top: 1ex; margin-bottom: 1ex; margin-left: 0; margin-right: 0; border-spacing: 0; } span.forum_author { color: #888; font-size: 75%; } span.forum_author::after { content: " | "; } span.forum_age { color: #888; font-size: 85%; } span.forum_buttons { font-size: 85%; } span.forum_buttons::before { color: #888; content: " | "; } span.forum_npost { color: #888; font-size: 75%; } table.forumeditform td { vertical-align: top; border-collapse: collapse; padding: 1px; } div.forum_body p { margin-top: 0; } |
Changes to src/forum.c.
︙ | ︙ | |||
109 110 111 112 113 114 115 | int iDepth = db_column_int(&q, 7); double rMTime = db_column_double(&q, 8); char *zAge = db_timespan_name(rNow - rMTime); Blob body; @ <!-- Forum post %d(id) --> @ <table class="forum_post"> @ <tr> | | | 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 | int iDepth = db_column_int(&q, 7); double rMTime = db_column_double(&q, 8); char *zAge = db_timespan_name(rNow - rMTime); Blob body; @ <!-- Forum post %d(id) --> @ <table class="forum_post"> @ <tr> @ <td class="forum_margin" width="%d(iDepth*40)" rowspan="2"> @ <td><span class="forum_author">%h(zUser)</span> @ <span class="forum_age">%s(zAge) ago</span> sqlite3_free(zAge); if( g.perm.WrForum ){ @ <span class="forum_buttons"> if( g.perm.AdminForum || fossil_strcmp(g.zLogin, zUser)==0 ){ @ <a href='%R/forumedit?item=%d(id)'>Edit</a> |
︙ | ︙ | |||
165 166 167 168 169 170 171 | } } style_footer(); } /* ** Use content in CGI parameters "s" (subject), "b" (body), and | | | | | 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 | } } style_footer(); } /* ** Use content in CGI parameters "s" (subject), "b" (body), and ** "mimetype" (mimetype) to create a new forum entry. ** Return the id of the new forum entry. ** ** If any problems occur, return 0 and set *pzErr to a description of ** the problem. ** ** Cases: ** ** itemId==0 && parentId==0 Starting a new thread. ** itemId==0 && parentId>0 New reply to parentId ** itemId>0 && parentId==0 Edit existing post itemId */ static int forum_post(int itemId, int parentId, char **pzErr){ const char *zSubject = 0; int threadId; double rNow = db_double(0.0, "SELECT julianday('now')"); const char *zMime = wiki_filter_mimetypes(P("mimetype")); if( itemId==0 && parentId==0 ){ /* Start a new thread. Subject required. */ sqlite3_uint64 r1, r2; zSubject = PT("s"); if( zSubject==0 || zSubject[0]==0 ){ *pzErr = "\"Subject\" required to start a new thread"; return 0; } sqlite3_randomness(sizeof(r1), &r1); sqlite3_randomness(sizeof(r2), &r2); db_multi_exec( "INSERT INTO forumthread(mthreadhash, mtitle, mtime, npost)" "VALUES(lower(hex(randomblob(28))),%Q,%!.17g,1)", zSubject, rNow ); threadId = db_last_insert_rowid(); }else{ threadId = db_int(0, "SELECT mthreadid FROM forumpost" " WHERE mpostid=%d", itemId ? itemId : parentId); } |
︙ | ︙ | |||
217 218 219 220 221 222 223 | db_multi_exec( "UPDATE forumpost SET" " mtime=%!.17g," " mimetype=%Q," " ipaddr=%Q," " mbody=%Q" " WHERE mpostid=%d", | | | | 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 | db_multi_exec( "UPDATE forumpost SET" " mtime=%!.17g," " mimetype=%Q," " ipaddr=%Q," " mbody=%Q" " WHERE mpostid=%d", rNow, PT("mimetype"), P("REMOTE_ADDR"), PT("b"), itemId ); }else{ db_multi_exec( "INSERT INTO forumpost(mposthash,mthreadid,uname,mtime," " mstatus,mimetype,ipaddr,inreplyto,mbody) VALUES" " (lower(hex(randomblob(28))),%d,%Q,%!.17g,%Q,%Q,%Q,nullif(%d,0),%Q)", threadId,g.zLogin,rNow,NULL,zMime,P("REMOTE_ADDR"),parentId,P("b")); itemId = db_last_insert_rowid(); } if( zSubject==0 ){ db_multi_exec( "UPDATE forumthread SET mtime=%!.17g, npost=npost+1" " WHERE mthreadid=(SELECT mthreadid FROM forumpost WHERE mpostid=%d)", |
︙ | ︙ | |||
273 274 275 276 277 278 279 | if( P("x")!=0 && cgi_csrf_safe(1) ){ itemId = forum_post(itemId,parentId,&zErr); if( itemId ){ cgi_redirectf("%R/forum?item=%d",itemId); return; } } | | | | | | 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 | if( P("x")!=0 && cgi_csrf_safe(1) ){ itemId = forum_post(itemId,parentId,&zErr); if( itemId ){ cgi_redirectf("%R/forum?item=%d",itemId); return; } } if( itemId && (P("mimetype")==0 || P("b")==0) ){ Stmt q; db_prepare(&q, "SELECT mimetype, mbody FROM forumpost" " WHERE mpostid=%d", itemId); if( db_step(&q)==SQLITE_ROW ){ if( P("mimetype")==0 ){ cgi_set_query_parameter("mimetype", db_column_text(&q, 0)); } if( P("b")==0 ){ cgi_set_query_parameter("b", db_column_text(&q, 1)); } } db_finalize(&q); } zMime = wiki_filter_mimetypes(P("mimetype")); if( itemId>0 ){ style_header("Edit Forum Post"); }else if( parentId>0 ){ style_header("Comment On Forum Post"); }else{ style_header("New Forum Thread"); } |
︙ | ︙ | |||
310 311 312 313 314 315 316 | Blob x; @ <div class="forumpreview"> if( P("s") ){ @ <h1>%h(PT("s"))</h1> } @ <div class="forumpreviewbody"> blob_init(&x, PT("b"), -1); | | | 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 | Blob x; @ <div class="forumpreview"> if( P("s") ){ @ <h1>%h(PT("s"))</h1> } @ <div class="forumpreviewbody"> blob_init(&x, PT("b"), -1); wiki_render_by_mimetype(&x, PT("mimetype")); blob_reset(&x); @ </div> @ </div> @ <hr> } @ <table border="0" class="forumeditform"> if( zErr ){ |
︙ | ︙ |