Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | First attempt at a /subscribe page. Non-functional display only. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
fb3934ec53e86be5d2694cdcd0577fc5 |
User & Date: | drh 2018-06-20 22:39:55.647 |
Context
2018-06-20
| ||
22:53 | Do not show the "Change user:" form on the /logout page. It adds little value but much confusion. ... (check-in: 00bed59b user: drh tags: trunk) | |
22:39 | First attempt at a /subscribe page. Non-functional display only. ... (check-in: fb3934ec user: drh tags: trunk) | |
19:56 | Manage the email.c file. Accidentally omitted from the previous three check-ins. Bummer. ... (check-in: fa83e4b3 user: drh tags: trunk) | |
Changes
Changes to src/default_css.txt.
︙ | ︙ | |||
666 667 668 669 670 671 672 | vertical-align: top; border-collapse: collapse; padding: 1px; } div.forum_body p { margin-top: 0; } | > > > > | 666 667 668 669 670 671 672 673 674 675 676 | vertical-align: top; border-collapse: collapse; padding: 1px; } div.forum_body p { margin-top: 0; } td.form_label { vertical-align: top; text-align: right; } |
Changes to src/email.c.
︙ | ︙ | |||
28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 | static const char zEmailInit[] = @ -- Subscribers are distinct from users. A person can have a log-in in @ -- the USER table without being a subscriber. Or a person can be a @ -- subscriber without having a USER table entry. Or they can have both. @ -- In the last case the suname column points from the subscriber entry @ -- to the USER entry. @ -- @ CREATE TABLE repository.subscriber( @ subscriberId INTEGER PRIMARY KEY, -- numeric subscriber ID. Internal use @ subscriberCode TEXT UNIQUE, -- UUID for subscriber. External use @ sname TEXT, -- Human readable name @ suname TEXT, -- Corresponding USER or NULL @ semail TEXT, -- email address @ sverify BOOLEAN, -- email address verified @ sdonotcall BOOLEAN, -- true for Do Not Call @ sdigest BOOLEAN, -- true for daily digests only @ ssub TEXT, -- baseline subscriptions @ sctime DATE, -- When this entry was created. JulianDay @ smtime DATE, -- Last change. JulianDay @ sipaddr TEXT, -- IP address for last change @ spswdHash TEXT -- SHA3 hash of password @ ); @ | > > > > > > > > > > < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 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 | static const char zEmailInit[] = @ -- Subscribers are distinct from users. A person can have a log-in in @ -- the USER table without being a subscriber. Or a person can be a @ -- subscriber without having a USER table entry. Or they can have both. @ -- In the last case the suname column points from the subscriber entry @ -- to the USER entry. @ -- @ -- The ssub field is a string where each character indicates a particular @ -- type of event to subscribe to. Choices: @ -- a - Announcements @ -- c - Check-ins @ -- t - Ticket changes @ -- w - Wiki changes @ -- Probably different codes will be added in the future. In the future @ -- we might also add a separate table that allows subscribing to email @ -- notifications for specific branches or tags or tickets. @ -- @ CREATE TABLE repository.subscriber( @ subscriberId INTEGER PRIMARY KEY, -- numeric subscriber ID. Internal use @ subscriberCode TEXT UNIQUE, -- UUID for subscriber. External use @ sname TEXT, -- Human readable name @ suname TEXT, -- Corresponding USER or NULL @ semail TEXT, -- email address @ sverify BOOLEAN, -- email address verified @ sdonotcall BOOLEAN, -- true for Do Not Call @ sdigest BOOLEAN, -- true for daily digests only @ ssub TEXT, -- baseline subscriptions @ sctime DATE, -- When this entry was created. JulianDay @ smtime DATE, -- Last change. JulianDay @ sipaddr TEXT, -- IP address for last change @ spswdHash TEXT -- SHA3 hash of password @ ); @ @ -- Email notifications that need to be sent. @ -- @ -- If the eventid key is an integer, then it corresponds to the @ -- EVENT.OBJID table. Other kinds of eventids are reserved for @ -- future expansion. @ -- @ CREATE TABLE repository.email_pending( |
︙ | ︙ | |||
353 354 355 356 357 358 359 360 361 362 363 364 365 366 | /* ** COMMAND: email ** ** Usage: %fossil email SUBCOMMAND ARGS... ** ** Subcommands: ** ** send TO [OPTIONS] Send a single email message using whatever ** email sending mechanism is currently configured. ** Use this for testing the email configuration. ** Options: ** ** --body FILENAME | > > > > | 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 | /* ** COMMAND: email ** ** Usage: %fossil email SUBCOMMAND ARGS... ** ** Subcommands: ** ** reset Hard reset of all email notification tables ** in the repository. This erases all subscription ** information. Use with extreme care. ** ** send TO [OPTIONS] Send a single email message using whatever ** email sending mechanism is currently configured. ** Use this for testing the email configuration. ** Options: ** ** --body FILENAME |
︙ | ︙ | |||
374 375 376 377 378 379 380 381 382 383 384 385 386 387 | void email_cmd(void){ const char *zCmd; int nCmd; db_find_and_open_repository(0, 0); email_schema(); zCmd = g.argc>=3 ? g.argv[2] : "x"; nCmd = (int)strlen(zCmd); if( strncmp(zCmd, "send", nCmd)==0 ){ Blob prompt, body, hdr; int sendAsBoth = find_option("both",0,0)!=0; int sendAsHtml = find_option("html",0,0)!=0; const char *zDest = find_option("stdout",0,0)!=0 ? "stdout" : 0; int i; const char *zSubject = find_option("subject", "S", 1); | > > > > > > > > > > > > > > > > > > > > | 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 | void email_cmd(void){ const char *zCmd; int nCmd; db_find_and_open_repository(0, 0); email_schema(); zCmd = g.argc>=3 ? g.argv[2] : "x"; nCmd = (int)strlen(zCmd); if( strncmp(zCmd, "reset", nCmd)==0 ){ Blob yn; int c; fossil_print( "This will erase all content in the repository tables, thus\n" "deleting all subscriber information. The information will be\n" "unrecoverable.\n"); prompt_user("Continue? (y/N) ", &yn); c = blob_str(&yn)[0]; if( c=='y' ){ db_multi_exec( "DROP TABLE IF EXISTS subscriber;\n" "DROP TABLE IF EXISTS subscription;\n" "DROP TABLE IF EXISTS email_pending;\n" "DROP TABLE IF EXISTS email_bounce;\n" ); email_schema(); } blob_zero(&yn); }else if( strncmp(zCmd, "send", nCmd)==0 ){ Blob prompt, body, hdr; int sendAsBoth = find_option("both",0,0)!=0; int sendAsHtml = find_option("html",0,0)!=0; const char *zDest = find_option("stdout",0,0)!=0 ? "stdout" : 0; int i; const char *zSubject = find_option("subject", "S", 1); |
︙ | ︙ | |||
436 437 438 439 440 441 442 | pSetting = setting_info(&nSetting); for(; nSetting>0; nSetting--, pSetting++ ){ if( strncmp(pSetting->name,"email-",6)!=0 ) continue; print_setting(pSetting); } } else{ | | > > > > > > > | | > > > > > > > > > > > | | > | | | | | | | > > > > > > > > > > > > > > > > > > > > > > | > > | 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 | pSetting = setting_info(&nSetting); for(; nSetting>0; nSetting--, pSetting++ ){ if( strncmp(pSetting->name,"email-",6)!=0 ) continue; print_setting(pSetting); } } else{ usage("reset|send|setting"); } } /* ** WEBPAGE: subscribe ** ** Allow users to subscribe to email notifications, or to change or ** verify their subscription. */ void subscribe_page(void){ int needCaptcha; unsigned int uSeed; const char *zDecoded; char *zCaptcha; login_check_credentials(); if( !g.perm.EmailAlert ){ login_needed(g.anon.EmailAlert); return; } style_header("Email Subscription"); needCaptcha = P("usecaptcha")!=0 || login_is_nobody() || login_is_special(g.zLogin); form_begin(0, "%R/subscribe"); @ <table class="subscribe"> @ <tr> @ <td class="form_label">Email Address:</td> @ <td><input type="text" name="e" value="" size="30"></td> @ <td></td> @ </tr> if( needCaptcha ){ uSeed = captcha_seed(); zDecoded = captcha_decode(uSeed); zCaptcha = captcha_render(zDecoded); @ <tr> @ <td class="form_label">Security Code:</td> @ <td><input type="text" name="captcha" value="" size="30"> @ <input type="hidden" name="usecaptcha" value="1"></td> @ <input type="hidden" name="captchaseed" value="%u(uSeed)"></td> @ <td><span class="optionalTag">(copy from below)</span></td> @ </tr> } @ <tr> @ <td class="form_label">Nickname:</td> @ <td><input type="text" name="nn" value="" size="30"></td> @ <td><span class="optionalTag">(optional)</span></td> @ </tr> @ <tr> @ <td class="form_label">Password:</td> @ <td><input type="password" name="pw" value="" size="30"></td> @ <td><span class="optionalTag">(optional)</span></td> @ </tr> @ <tr> @ <td class="form_label">Options:</td> @ <td><label><input type="checkbox" name="sa" value="0">\ @ Announcements</label><br> @ <label><input type="checkbox" name="sc" value="0">\ @ Check-ins</label><br> @ <label><input type="checkbox" name="st" value="0">\ @ Ticket changes</label><br> @ <label><input type="checkbox" name="sw" value="0">\ @ Wiki</label><br> @ <label><input type="checkbox" name="di" value="0">\ @ Daily digest only</label><br></td> @ </tr> @ <tr> @ <td></td> @ <td><input type="submit" value="Submit"></td> @ </tr> @ </table> if( needCaptcha ){ @ <div class="captcha"><table class="captcha"><tr><td><pre> @ %h(zCaptcha) @ </pre> @ Enter the 8 characters above in the "Security Code" box @ </td></tr></table></div> } @ </form> style_footer(); } |