Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Enhancements to administrator access to the subscriber list. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
b7b877ef4928572c63029857d5c5ea36 |
| User & Date: | drh 2018-06-25 14:45:56 |
Context
|
2018-06-25
| ||
| 15:56 | Add the ability to transfer subscriber information using the "fossil config sync alert" command. (check-in: 22c3354d user: drh tags: trunk) | |
| 14:45 | Enhancements to administrator access to the subscriber list. (check-in: b7b877ef user: drh tags: trunk) | |
| 14:26 | Extend the user capability system to allow the use of upper-case ASCII letters for new capabilities. (check-in: e45cfde7 user: drh tags: trunk) | |
Changes
Changes to src/email.c.
1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 .... 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 .... 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 .... 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 .... 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 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 .... 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 |
Stmt q;
int sa, sc, st, sw;
int sdigest, sdonotcall, sverified;
const char *ssub;
const char *semail;
const char *smip;
const char *suname;
int eErr = 0;
char *zErr = 0;
if( email_webpages_disabled() ) return;
login_check_credentials();
if( zName==0 && login_is_individual() ){
zName = db_text(0, "SELECT hex(subscriberCode) FROM subscriber"
................................................................................
}else{
email_unsubscribe(zName);
return;
}
}
db_prepare(&q,
"SELECT"
" semail,"
" sverified,"
" sdonotcall,"
" sdigest,"
" ssub,"
" smip,"
" suname"
" FROM subscriber WHERE subscriberCode=hextoblob(%Q)", zName);
if( db_step(&q)!=SQLITE_ROW ){
db_finalize(&q);
cgi_redirect("subscribe");
return;
}
style_header("Update Subscription");
................................................................................
ssub = db_column_text(&q, 4);
sa = strchr(ssub,'a')!=0;
sc = strchr(ssub,'c')!=0;
st = strchr(ssub,'t')!=0;
sw = strchr(ssub,'w')!=0;
smip = db_column_text(&q, 5);
suname = db_column_text(&q, 6);
if( !g.perm.Admin && !sverified ){
db_multi_exec(
"UPDATE subscriber SET sverified=1 WHERE subscriberCode=hextoblob(%Q)",
zName);
@ <h1>Your email alert subscription has been verified!</h1>
@ <p>Use the form below to update your subscription information.</p>
@ <p>Hint: Bookmark this page so that you can more easily update
................................................................................
@ <input type="hidden" name="name" value="%h(zName)">
@ <table class="subscribe">
@ <tr>
@ <td class="form_label">Email Address:</td>
@ <td>%h(semail)</td>
@ </tr>
if( g.perm.Admin ){
@ <tr>
@ <td class='form_label'>IP Address:</td>
@ <td>%h(smip)</td>
@ </tr>
@ <tr>
@ <td class="form_label">User:</td>
@ <td><input type="text" name="suname" value="%h(suname?suname:"")" \
................................................................................
** Clicking on an email takes one to the /alerts page
** for that email where the delivery settings can be
** modified.
*/
void subscriber_list_page(void){
Blob sql;
Stmt q;
if( email_webpages_disabled() ) return;
login_check_credentials();
if( !g.perm.Admin ){
fossil_redirect_home();
return;
}
email_submenu_common();
style_header("Subscriber List");
blob_init(&sql, 0, 0);
blob_append_sql(&sql,
"SELECT hex(subscriberCode),"
" semail,"
" ssub,"
" suname,"
" sverified,"
" sdigest"
" FROM subscriber"
);
db_prepare_blob(&q, &sql);
@ <table border="1">
@ <tr>
@ <th>Email
@ <th>Events
@ <th>Digest-Only?
@ <th>User
@ <th>Verified?
@ </tr>
while( db_step(&q)==SQLITE_ROW ){
@ <tr>
@ <td><a href='%R/alerts/%s(db_column_text(&q,0))'>\
@ %h(db_column_text(&q,1))</a></td>
@ <td>%h(db_column_text(&q,2))</td>
@ <td>%s(db_column_int(&q,5)?"digest":"")</td>
@ <td>%h(db_column_text(&q,3))</td>
@ <td>%s(db_column_int(&q,4)?"yes":"pending")</td>
@ </tr>
}
@ </table>
db_finalize(&q);
style_footer();
}
................................................................................
if( db_transaction_nesting_depth()!=0 ){
fossil_warning("Called email_auto_exec() from within a transaction");
return;
}
db_begin_transaction();
if( !email_tables_exist() ) goto autoexec_done;
if( !db_get_boolean("email-autoexec",0) ) goto autoexec_done;
if( !db_exists("SELECT 1 FROM pending_alert") ) goto autoexec_done;
email_send_alerts(0);
iJulianDay = db_int(0, "SELECT julianday('now')");
if( iJulianDay>db_get_int("email-last-digest",0) ){
if( db_transaction_nesting_depth()!=1 ){
fossil_warning("Transaction nesting error prior to digest processing");
}else{
db_set_int("email-last-digest",iJulianDay,0);
|
> > | | | | | | | > > > > > > > > > > > > > | | | | | | > > > > > > > > < |
1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 .... 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 .... 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 .... 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 .... 1441 1442 1443 1444 1445 1446 1447 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 .... 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 |
Stmt q; int sa, sc, st, sw; int sdigest, sdonotcall, sverified; const char *ssub; const char *semail; const char *smip; const char *suname; char *smtime; char *sctime; int eErr = 0; char *zErr = 0; if( email_webpages_disabled() ) return; login_check_credentials(); if( zName==0 && login_is_individual() ){ zName = db_text(0, "SELECT hex(subscriberCode) FROM subscriber" ................................................................................ }else{ email_unsubscribe(zName); return; } } db_prepare(&q, "SELECT" " semail," /* 0 */ " sverified," /* 1 */ " sdonotcall," /* 2 */ " sdigest," /* 3 */ " ssub," /* 4 */ " smip," /* 5 */ " suname," /* 6 */ " datetime(smtime)," /* 7 */ " datetime(sctime)" /* 8 */ " FROM subscriber WHERE subscriberCode=hextoblob(%Q)", zName); if( db_step(&q)!=SQLITE_ROW ){ db_finalize(&q); cgi_redirect("subscribe"); return; } style_header("Update Subscription"); ................................................................................ ssub = db_column_text(&q, 4); sa = strchr(ssub,'a')!=0; sc = strchr(ssub,'c')!=0; st = strchr(ssub,'t')!=0; sw = strchr(ssub,'w')!=0; smip = db_column_text(&q, 5); suname = db_column_text(&q, 6); smtime = db_column_text(&q, 7); sctime = db_column_text(&q, 8); if( !g.perm.Admin && !sverified ){ db_multi_exec( "UPDATE subscriber SET sverified=1 WHERE subscriberCode=hextoblob(%Q)", zName); @ <h1>Your email alert subscription has been verified!</h1> @ <p>Use the form below to update your subscription information.</p> @ <p>Hint: Bookmark this page so that you can more easily update ................................................................................ @ <input type="hidden" name="name" value="%h(zName)"> @ <table class="subscribe"> @ <tr> @ <td class="form_label">Email Address:</td> @ <td>%h(semail)</td> @ </tr> if( g.perm.Admin ){ @ <tr> @ <td class='form_label'>Created:</td> @ <td>%h(sctime)</td> @ </tr> @ <tr> @ <td class='form_label'>Last Modified:</td> @ <td>%h(smtime)</td> @ </tr> @ <tr> @ <td class='form_label'>IP Address:</td> @ <td>%h(smip)</td> @ </tr> @ <tr> @ <td class="form_label">User:</td> @ <td><input type="text" name="suname" value="%h(suname?suname:"")" \ ................................................................................ ** Clicking on an email takes one to the /alerts page ** for that email where the delivery settings can be ** modified. */ void subscriber_list_page(void){ Blob sql; Stmt q; double rNow; if( email_webpages_disabled() ) return; login_check_credentials(); if( !g.perm.Admin ){ fossil_redirect_home(); return; } email_submenu_common(); style_header("Subscriber List"); blob_init(&sql, 0, 0); blob_append_sql(&sql, "SELECT hex(subscriberCode)," /* 0 */ " semail," /* 1 */ " ssub," /* 2 */ " suname," /* 3 */ " sverified," /* 4 */ " sdigest," /* 5 */ " date(sctime)," /* 6 */ " smtime" /* 7 */ " FROM subscriber" ); db_prepare_blob(&q, &sql); rNow = db_double(0.0,"SELECT julianday('now')"); @ <table border="1"> @ <tr> @ <th>Email @ <th>Events @ <th>Digest-Only? @ <th>User @ <th>Verified? @ <th>Last change @ <th>Created @ </tr> while( db_step(&q)==SQLITE_ROW ){ double rAge = rNow - db_column_double(&q, 7); @ <tr> @ <td><a href='%R/alerts/%s(db_column_text(&q,0))'>\ @ %h(db_column_text(&q,1))</a></td> @ <td>%h(db_column_text(&q,2))</td> @ <td>%s(db_column_int(&q,5)?"digest":"")</td> @ <td>%h(db_column_text(&q,3))</td> @ <td>%s(db_column_int(&q,4)?"yes":"pending")</td> @ <td>%z(human_readable_age(rAge)) ago</td> @ <td>%h(db_column_text(&q,6))</td> @ </tr> } @ </table> db_finalize(&q); style_footer(); } ................................................................................ if( db_transaction_nesting_depth()!=0 ){ fossil_warning("Called email_auto_exec() from within a transaction"); return; } db_begin_transaction(); if( !email_tables_exist() ) goto autoexec_done; if( !db_get_boolean("email-autoexec",0) ) goto autoexec_done; email_send_alerts(0); iJulianDay = db_int(0, "SELECT julianday('now')"); if( iJulianDay>db_get_int("email-last-digest",0) ){ if( db_transaction_nesting_depth()!=1 ){ fossil_warning("Transaction nesting error prior to digest processing"); }else{ db_set_int("email-last-digest",iJulianDay,0); |