Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fixes to the /webmail screen |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
a24de3f9fc4f3eb36a4b811d06bb1723 |
| User & Date: | drh 2018-08-16 01:46:22 |
Context
|
2018-08-16
| ||
| 02:03 | Fix the hextoblob() function so that does not report out-of-memory if the size of the input string is zero bytes. This fixes the instances of "out-of-memory" reports when accessing the /alerts page without an argument. (check-in: 5519c6b8 user: drh tags: trunk) | |
| 01:46 | Fixes to the /webmail screen (check-in: a24de3f9 user: drh tags: trunk) | |
| 01:43 | Add comments to the /register page implementation. No logic changes. (check-in: a4419c6c user: drh tags: trunk) | |
Changes
Changes to src/webmail.c.
618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 ... 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 ... 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 |
style_footer();
return;
}
add_content_sql_commands(g.db);
emailid = atoi(PD("id","0"));
url_initialize(&url, "webmail");
if( g.perm.Admin ){
zUser = P("user");
if( zUser ){
url_add_parameter(&url, "user", zUser);
if( fossil_strcmp(zUser,"*")==0 ){
showAll = 1;
zUser = 0;
}
}
................................................................................
pg = atoi(PD("pg","0"));
blob_append_sql(&sql, " ORDER BY edate DESC limit %d offset %d", N+1, pg*N);
db_multi_exec("%s", blob_sql_text(&sql));
got = db_int(0, "SELECT count(*) FROM tmbox");
db_prepare(&q, "SELECT * FROM tmbox LIMIT %d", N);
blob_reset(&sql);
@ <form action="%R/webmail" method="POST">
@ <table border="0" width="100%%">
@ <input type="hidden" name="d" value="%d(d)">
@ <input type="hidden" name="user" value="%h(zUser)">
@ <tr><td align="left">
if( d==2 ){
@ <input type="submit" name="read" value="Undelete">
@ <input type="submit" name="purge" value="Delete Permanently">
}else{
@ <input type="submit" name="trash" value="Delete">
if( d!=1 ){
@ <input type="submit" name="unread" value="Mark as unread">
}
@ <input type="submit" name="read" value="Mark as read">
}
@ <button onclick="webmailSelectAll(); return false;">Select All</button>
@ <a href="%s(url_render(&url,0,0,0,0))">refresh</a>
@ </td><td align="right">
if( pg>0 ){
sqlite3_snprintf(sizeof(zPPg), zPPg, "%d", pg-1);
@ <a href="%s(url_render(&url,"pg",zPPg,0,0))">< Newer</a>
}
if( got>50 ){
sqlite3_snprintf(sizeof(zNPg),zNPg,"%d",pg+1);
................................................................................
const char *zFrom = db_column_text(&q, 1);
const char *zDate = db_column_text(&q, 2);
const char *zSubject = db_column_text(&q, 4);
if( zSubject==0 || zSubject[0]==0 ) zSubject = "(no subject)";
@ <tr>
@ <td><input type="checkbox" class="webmailckbox" name="e%s(zId)"></td>
@ <td>%h(zFrom)</td>
@ <td><a href="%s(url_render(&url,"id",zId,0,0))">%h(zSubject)</a> \
@ %s(zDate)</td>
if( showAll ){
const char *zTo = db_column_text(&q,5);
@ <td><a href="%s(url_render(&url,"user",zTo,0,0))">%h(zTo)</a></td>
}
@ </tr>
}
db_finalize(&q);
@ </table>
@ </form>
style_footer();
@ <script>
@ function webmailSelectAll(){
@ var x = document.getElementsByClassName("webmailckbox");
@ for(i=0; i<x.length; i++){
@ x[i].checked = true;
@ }
@ }
@ </script>
db_end_transaction(0);
}
/*
** WEBPAGE: emailblob
**
** This page, accessible only to administrators, allows easy viewing of
|
| < | > | | | < > |
618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 ... 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 ... 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 |
style_footer();
return;
}
add_content_sql_commands(g.db);
emailid = atoi(PD("id","0"));
url_initialize(&url, "webmail");
if( g.perm.Admin ){
zUser = PD("user",g.zLogin);
if( zUser ){
url_add_parameter(&url, "user", zUser);
if( fossil_strcmp(zUser,"*")==0 ){
showAll = 1;
zUser = 0;
}
}
................................................................................
pg = atoi(PD("pg","0"));
blob_append_sql(&sql, " ORDER BY edate DESC limit %d offset %d", N+1, pg*N);
db_multi_exec("%s", blob_sql_text(&sql));
got = db_int(0, "SELECT count(*) FROM tmbox");
db_prepare(&q, "SELECT * FROM tmbox LIMIT %d", N);
blob_reset(&sql);
@ <form action="%R/webmail" method="POST">
@ <input type="hidden" name="d" value="%d(d)">
@ <input type="hidden" name="user" value="%h(zUser?zUser:"*")">
@ <table border="0" width="100%%">
@ <tr><td align="left">
if( d==2 ){
@ <input type="submit" name="read" value="Undelete">
@ <input type="submit" name="purge" value="Delete Permanently">
}else{
@ <input type="submit" name="trash" value="Delete">
if( d!=1 ){
@ <input type="submit" name="unread" value="Mark as unread">
}
@ <input type="submit" name="read" value="Mark as read">
}
@ <button onclick="webmailSelectAll(); return false;">Select All</button>
@ <a href="%h(url_render(&url,0,0,0,0))">refresh</a>
@ </td><td align="right">
if( pg>0 ){
sqlite3_snprintf(sizeof(zPPg), zPPg, "%d", pg-1);
@ <a href="%s(url_render(&url,"pg",zPPg,0,0))">< Newer</a>
}
if( got>50 ){
sqlite3_snprintf(sizeof(zNPg),zNPg,"%d",pg+1);
................................................................................
const char *zFrom = db_column_text(&q, 1);
const char *zDate = db_column_text(&q, 2);
const char *zSubject = db_column_text(&q, 4);
if( zSubject==0 || zSubject[0]==0 ) zSubject = "(no subject)";
@ <tr>
@ <td><input type="checkbox" class="webmailckbox" name="e%s(zId)"></td>
@ <td>%h(zFrom)</td>
@ <td><a href="%h(url_render(&url,"id",zId,0,0))">%h(zSubject)</a> \
@ %s(zDate)</td>
if( showAll ){
const char *zTo = db_column_text(&q,5);
@ <td><a href="%h(url_render(&url,"user",zTo,0,0))">%h(zTo)</a></td>
}
@ </tr>
}
db_finalize(&q);
@ </table>
@ </form>
@ <script>
@ function webmailSelectAll(){
@ var x = document.getElementsByClassName("webmailckbox");
@ for(i=0; i<x.length; i++){
@ x[i].checked = true;
@ }
@ }
@ </script>
style_footer();
db_end_transaction(0);
}
/*
** WEBPAGE: emailblob
**
** This page, accessible only to administrators, allows easy viewing of
|