Fossil SCM
Change the message for the 'user elevation' notification to help clarify that it's not necessarily an elevation. Help/message text changes only - no functional changes.
Commit
eabccae174afdf0f344c1a6aefd2e7ce73e1a532982d08f4b96d74fad1810c79
Parent
c98eec22c29a4ab…
2 files changed
+3
-3
+3
-3
+3
-3
| --- src/alerts.c | ||
| +++ src/alerts.c | ||
| @@ -51,11 +51,11 @@ | ||
| 51 | 51 | @ -- f - Forum posts |
| 52 | 52 | @ -- k - ** Special: Unsubscribed using /oneclickunsub |
| 53 | 53 | @ -- n - New forum threads |
| 54 | 54 | @ -- r - Replies to my own forum posts |
| 55 | 55 | @ -- t - Ticket changes |
| 56 | -@ -- u - Elevation of users' permissions (admins only) | |
| 56 | +@ -- u - Potential elevation of users' permissions (admins only) | |
| 57 | 57 | @ -- w - Wiki changes |
| 58 | 58 | @ -- x - Edits to forum posts |
| 59 | 59 | @ -- Probably different codes will be added in the future. In the future |
| 60 | 60 | @ -- we might also add a separate table that allows subscribing to email |
| 61 | 61 | @ -- notifications for specific branches or tags or tickets. |
| @@ -1721,11 +1721,11 @@ | ||
| 1721 | 1721 | @ <label><input type="checkbox" name="sw" %s(PCK("sw"))> \ |
| 1722 | 1722 | @ Wiki</label><br> |
| 1723 | 1723 | } |
| 1724 | 1724 | if( g.perm.Admin ){ |
| 1725 | 1725 | @ <label><input type="checkbox" name="su" %s(PCK("su"))> \ |
| 1726 | - @ User permission elevation</label> | |
| 1726 | + @ User permission additions</label> | |
| 1727 | 1727 | } |
| 1728 | 1728 | di = PB("di"); |
| 1729 | 1729 | @ </td></tr> |
| 1730 | 1730 | @ <tr> |
| 1731 | 1731 | @ <td class="form_label">Delivery:</td> |
| @@ -2131,11 +2131,11 @@ | ||
| 2131 | 2131 | /* Corner-case bug: if an admin assigns 'u' to a non-admin, that |
| 2132 | 2132 | ** subscription will get removed if the user later edits their |
| 2133 | 2133 | ** subscriptions, as non-admins are not permitted to add that |
| 2134 | 2134 | ** subscription. */ |
| 2135 | 2135 | @ <label><input type="checkbox" name="su" %s(su?"checked":"")>\ |
| 2136 | - @ User permission elevation</label> | |
| 2136 | + @ User permission additions</label> | |
| 2137 | 2137 | } |
| 2138 | 2138 | @ </td></tr> |
| 2139 | 2139 | if( strchr(ssub,'k')!=0 ){ |
| 2140 | 2140 | @ <tr><td></td><td> ↑ |
| 2141 | 2141 | @ Note: User did a one-click unsubscribe</td></tr> |
| 2142 | 2142 |
| --- src/alerts.c | |
| +++ src/alerts.c | |
| @@ -51,11 +51,11 @@ | |
| 51 | @ -- f - Forum posts |
| 52 | @ -- k - ** Special: Unsubscribed using /oneclickunsub |
| 53 | @ -- n - New forum threads |
| 54 | @ -- r - Replies to my own forum posts |
| 55 | @ -- t - Ticket changes |
| 56 | @ -- u - Elevation of users' permissions (admins only) |
| 57 | @ -- w - Wiki changes |
| 58 | @ -- x - Edits to forum posts |
| 59 | @ -- Probably different codes will be added in the future. In the future |
| 60 | @ -- we might also add a separate table that allows subscribing to email |
| 61 | @ -- notifications for specific branches or tags or tickets. |
| @@ -1721,11 +1721,11 @@ | |
| 1721 | @ <label><input type="checkbox" name="sw" %s(PCK("sw"))> \ |
| 1722 | @ Wiki</label><br> |
| 1723 | } |
| 1724 | if( g.perm.Admin ){ |
| 1725 | @ <label><input type="checkbox" name="su" %s(PCK("su"))> \ |
| 1726 | @ User permission elevation</label> |
| 1727 | } |
| 1728 | di = PB("di"); |
| 1729 | @ </td></tr> |
| 1730 | @ <tr> |
| 1731 | @ <td class="form_label">Delivery:</td> |
| @@ -2131,11 +2131,11 @@ | |
| 2131 | /* Corner-case bug: if an admin assigns 'u' to a non-admin, that |
| 2132 | ** subscription will get removed if the user later edits their |
| 2133 | ** subscriptions, as non-admins are not permitted to add that |
| 2134 | ** subscription. */ |
| 2135 | @ <label><input type="checkbox" name="su" %s(su?"checked":"")>\ |
| 2136 | @ User permission elevation</label> |
| 2137 | } |
| 2138 | @ </td></tr> |
| 2139 | if( strchr(ssub,'k')!=0 ){ |
| 2140 | @ <tr><td></td><td> ↑ |
| 2141 | @ Note: User did a one-click unsubscribe</td></tr> |
| 2142 |
| --- src/alerts.c | |
| +++ src/alerts.c | |
| @@ -51,11 +51,11 @@ | |
| 51 | @ -- f - Forum posts |
| 52 | @ -- k - ** Special: Unsubscribed using /oneclickunsub |
| 53 | @ -- n - New forum threads |
| 54 | @ -- r - Replies to my own forum posts |
| 55 | @ -- t - Ticket changes |
| 56 | @ -- u - Potential elevation of users' permissions (admins only) |
| 57 | @ -- w - Wiki changes |
| 58 | @ -- x - Edits to forum posts |
| 59 | @ -- Probably different codes will be added in the future. In the future |
| 60 | @ -- we might also add a separate table that allows subscribing to email |
| 61 | @ -- notifications for specific branches or tags or tickets. |
| @@ -1721,11 +1721,11 @@ | |
| 1721 | @ <label><input type="checkbox" name="sw" %s(PCK("sw"))> \ |
| 1722 | @ Wiki</label><br> |
| 1723 | } |
| 1724 | if( g.perm.Admin ){ |
| 1725 | @ <label><input type="checkbox" name="su" %s(PCK("su"))> \ |
| 1726 | @ User permission additions</label> |
| 1727 | } |
| 1728 | di = PB("di"); |
| 1729 | @ </td></tr> |
| 1730 | @ <tr> |
| 1731 | @ <td class="form_label">Delivery:</td> |
| @@ -2131,11 +2131,11 @@ | |
| 2131 | /* Corner-case bug: if an admin assigns 'u' to a non-admin, that |
| 2132 | ** subscription will get removed if the user later edits their |
| 2133 | ** subscriptions, as non-admins are not permitted to add that |
| 2134 | ** subscription. */ |
| 2135 | @ <label><input type="checkbox" name="su" %s(su?"checked":"")>\ |
| 2136 | @ User permission additions</label> |
| 2137 | } |
| 2138 | @ </td></tr> |
| 2139 | if( strchr(ssub,'k')!=0 ){ |
| 2140 | @ <tr><td></td><td> ↑ |
| 2141 | @ Note: User did a one-click unsubscribe</td></tr> |
| 2142 |
+3
-3
| --- src/setupuser.c | ||
| +++ src/setupuser.c | ||
| @@ -349,21 +349,21 @@ | ||
| 349 | 349 | char * zSubject; |
| 350 | 350 | |
| 351 | 351 | if( !alert_enabled() ) return; |
| 352 | 352 | zSubject = bIsNew |
| 353 | 353 | ? mprintf("New user created: [%q]", zLogin) |
| 354 | - : mprintf("User [%q] permissions elevated", zLogin); | |
| 354 | + : mprintf("User [%q] capabilities changed", zLogin); | |
| 355 | 355 | zURL = db_get("email-url",0); |
| 356 | 356 | zSubname = db_get("email-subname", "[Fossil Repo]"); |
| 357 | 357 | blob_init(&body, 0, 0); |
| 358 | 358 | blob_init(&hdr, 0, 0); |
| 359 | 359 | if( bIsNew ){ |
| 360 | - blob_appendf(&body, "User [%q] was created by with " | |
| 360 | + blob_appendf(&body, "User [%q] was created with " | |
| 361 | 361 | "permissions [%q] by user [%q].\n", |
| 362 | 362 | zLogin, zNewCaps, g.zLogin); |
| 363 | 363 | } else { |
| 364 | - blob_appendf(&body, "Permissions for user [%q] where elevated " | |
| 364 | + blob_appendf(&body, "Permissions for user [%q] where changed " | |
| 365 | 365 | "from [%q] to [%q] by user [%q].\n", |
| 366 | 366 | zLogin, zOrigCaps, zNewCaps, g.zLogin); |
| 367 | 367 | } |
| 368 | 368 | if( zURL ){ |
| 369 | 369 | blob_appendf(&body, "\nUser editor: %s/setup_uedit?uid=%d\n", zURL, uid); |
| 370 | 370 |
| --- src/setupuser.c | |
| +++ src/setupuser.c | |
| @@ -349,21 +349,21 @@ | |
| 349 | char * zSubject; |
| 350 | |
| 351 | if( !alert_enabled() ) return; |
| 352 | zSubject = bIsNew |
| 353 | ? mprintf("New user created: [%q]", zLogin) |
| 354 | : mprintf("User [%q] permissions elevated", zLogin); |
| 355 | zURL = db_get("email-url",0); |
| 356 | zSubname = db_get("email-subname", "[Fossil Repo]"); |
| 357 | blob_init(&body, 0, 0); |
| 358 | blob_init(&hdr, 0, 0); |
| 359 | if( bIsNew ){ |
| 360 | blob_appendf(&body, "User [%q] was created by with " |
| 361 | "permissions [%q] by user [%q].\n", |
| 362 | zLogin, zNewCaps, g.zLogin); |
| 363 | } else { |
| 364 | blob_appendf(&body, "Permissions for user [%q] where elevated " |
| 365 | "from [%q] to [%q] by user [%q].\n", |
| 366 | zLogin, zOrigCaps, zNewCaps, g.zLogin); |
| 367 | } |
| 368 | if( zURL ){ |
| 369 | blob_appendf(&body, "\nUser editor: %s/setup_uedit?uid=%d\n", zURL, uid); |
| 370 |
| --- src/setupuser.c | |
| +++ src/setupuser.c | |
| @@ -349,21 +349,21 @@ | |
| 349 | char * zSubject; |
| 350 | |
| 351 | if( !alert_enabled() ) return; |
| 352 | zSubject = bIsNew |
| 353 | ? mprintf("New user created: [%q]", zLogin) |
| 354 | : mprintf("User [%q] capabilities changed", zLogin); |
| 355 | zURL = db_get("email-url",0); |
| 356 | zSubname = db_get("email-subname", "[Fossil Repo]"); |
| 357 | blob_init(&body, 0, 0); |
| 358 | blob_init(&hdr, 0, 0); |
| 359 | if( bIsNew ){ |
| 360 | blob_appendf(&body, "User [%q] was created with " |
| 361 | "permissions [%q] by user [%q].\n", |
| 362 | zLogin, zNewCaps, g.zLogin); |
| 363 | } else { |
| 364 | blob_appendf(&body, "Permissions for user [%q] where changed " |
| 365 | "from [%q] to [%q] by user [%q].\n", |
| 366 | zLogin, zOrigCaps, zNewCaps, g.zLogin); |
| 367 | } |
| 368 | if( zURL ){ |
| 369 | blob_appendf(&body, "\nUser editor: %s/setup_uedit?uid=%d\n", zURL, uid); |
| 370 |