Fossil SCM
Add the auto-captcha setting back to the command-line setting command. Default auto-captcha to on.
Commit
5fbd593aa7eae112b8f22c4819c1a1384ccbc049
Parent
4a198644196af9b…
2 files changed
+4
+1
-1
M
src/db.c
+4
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -1488,10 +1488,13 @@ | ||
| 1488 | 1488 | ** values. With just a property name it shows the value of that property. |
| 1489 | 1489 | ** With a value argument it changes the property for the current repository. |
| 1490 | 1490 | ** |
| 1491 | 1491 | ** The "unset" command clears a property setting. |
| 1492 | 1492 | ** |
| 1493 | +** | |
| 1494 | +** auto-captcha If enabled, the Login page provides a button to | |
| 1495 | +** fill in the captcha password. Default: on | |
| 1493 | 1496 | ** |
| 1494 | 1497 | ** autosync If enabled, automatically pull prior to commit |
| 1495 | 1498 | ** or update and automatically push after commit or |
| 1496 | 1499 | ** tag or branch creation. If the the value is "pullonly" |
| 1497 | 1500 | ** then only pull operations occur automatically. |
| @@ -1543,10 +1546,11 @@ | ||
| 1543 | 1546 | ** Defaults to "start" on windows, "open" on Mac, |
| 1544 | 1547 | ** and "firefox" on Unix. |
| 1545 | 1548 | */ |
| 1546 | 1549 | void setting_cmd(void){ |
| 1547 | 1550 | static const char *azName[] = { |
| 1551 | + "auto-captcha", | |
| 1548 | 1552 | "autosync", |
| 1549 | 1553 | "binary-glob", |
| 1550 | 1554 | "clearsign", |
| 1551 | 1555 | "diff-command", |
| 1552 | 1556 | "dont-push", |
| 1553 | 1557 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1488,10 +1488,13 @@ | |
| 1488 | ** values. With just a property name it shows the value of that property. |
| 1489 | ** With a value argument it changes the property for the current repository. |
| 1490 | ** |
| 1491 | ** The "unset" command clears a property setting. |
| 1492 | ** |
| 1493 | ** |
| 1494 | ** autosync If enabled, automatically pull prior to commit |
| 1495 | ** or update and automatically push after commit or |
| 1496 | ** tag or branch creation. If the the value is "pullonly" |
| 1497 | ** then only pull operations occur automatically. |
| @@ -1543,10 +1546,11 @@ | |
| 1543 | ** Defaults to "start" on windows, "open" on Mac, |
| 1544 | ** and "firefox" on Unix. |
| 1545 | */ |
| 1546 | void setting_cmd(void){ |
| 1547 | static const char *azName[] = { |
| 1548 | "autosync", |
| 1549 | "binary-glob", |
| 1550 | "clearsign", |
| 1551 | "diff-command", |
| 1552 | "dont-push", |
| 1553 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1488,10 +1488,13 @@ | |
| 1488 | ** values. With just a property name it shows the value of that property. |
| 1489 | ** With a value argument it changes the property for the current repository. |
| 1490 | ** |
| 1491 | ** The "unset" command clears a property setting. |
| 1492 | ** |
| 1493 | ** |
| 1494 | ** auto-captcha If enabled, the Login page provides a button to |
| 1495 | ** fill in the captcha password. Default: on |
| 1496 | ** |
| 1497 | ** autosync If enabled, automatically pull prior to commit |
| 1498 | ** or update and automatically push after commit or |
| 1499 | ** tag or branch creation. If the the value is "pullonly" |
| 1500 | ** then only pull operations occur automatically. |
| @@ -1543,10 +1546,11 @@ | |
| 1546 | ** Defaults to "start" on windows, "open" on Mac, |
| 1547 | ** and "firefox" on Unix. |
| 1548 | */ |
| 1549 | void setting_cmd(void){ |
| 1550 | static const char *azName[] = { |
| 1551 | "auto-captcha", |
| 1552 | "autosync", |
| 1553 | "binary-glob", |
| 1554 | "clearsign", |
| 1555 | "diff-command", |
| 1556 | "dont-push", |
| 1557 |
+1
-1
| --- src/login.c | ||
| +++ src/login.c | ||
| @@ -268,11 +268,11 @@ | ||
| 268 | 268 | @ You must configure your web browser to accept cookies in order for |
| 269 | 269 | @ the login to take.</p> |
| 270 | 270 | if( zAnonPw ){ |
| 271 | 271 | unsigned int uSeed = captcha_seed(); |
| 272 | 272 | char const *zDecoded = captcha_decode(uSeed); |
| 273 | - int bAutoCaptcha = db_get_boolean("auto-captcha", 0); | |
| 273 | + int bAutoCaptcha = db_get_boolean("auto-captcha", 1); | |
| 274 | 274 | char *zCaptcha = captcha_render(zDecoded); |
| 275 | 275 | |
| 276 | 276 | @ <input type="hidden" name="cs" value="%u(uSeed)"/> |
| 277 | 277 | @ <p>Visitors may enter <b>anonymous</b> as the user-ID with |
| 278 | 278 | @ the 8-character hexadecimal password shown below:</p> |
| 279 | 279 |
| --- src/login.c | |
| +++ src/login.c | |
| @@ -268,11 +268,11 @@ | |
| 268 | @ You must configure your web browser to accept cookies in order for |
| 269 | @ the login to take.</p> |
| 270 | if( zAnonPw ){ |
| 271 | unsigned int uSeed = captcha_seed(); |
| 272 | char const *zDecoded = captcha_decode(uSeed); |
| 273 | int bAutoCaptcha = db_get_boolean("auto-captcha", 0); |
| 274 | char *zCaptcha = captcha_render(zDecoded); |
| 275 | |
| 276 | @ <input type="hidden" name="cs" value="%u(uSeed)"/> |
| 277 | @ <p>Visitors may enter <b>anonymous</b> as the user-ID with |
| 278 | @ the 8-character hexadecimal password shown below:</p> |
| 279 |
| --- src/login.c | |
| +++ src/login.c | |
| @@ -268,11 +268,11 @@ | |
| 268 | @ You must configure your web browser to accept cookies in order for |
| 269 | @ the login to take.</p> |
| 270 | if( zAnonPw ){ |
| 271 | unsigned int uSeed = captcha_seed(); |
| 272 | char const *zDecoded = captcha_decode(uSeed); |
| 273 | int bAutoCaptcha = db_get_boolean("auto-captcha", 1); |
| 274 | char *zCaptcha = captcha_render(zDecoded); |
| 275 | |
| 276 | @ <input type="hidden" name="cs" value="%u(uSeed)"/> |
| 277 | @ <p>Visitors may enter <b>anonymous</b> as the user-ID with |
| 278 | @ the 8-character hexadecimal password shown below:</p> |
| 279 |