diff options
| author | VirtualTam <virtualtam@flibidi.net> | 2017-10-25 23:03:31 +0200 |
|---|---|---|
| committer | VirtualTam <virtualtam@flibidi.net> | 2018-02-05 18:12:09 +0100 |
| commit | 44acf706812bc77812e6648c2cc28af36e172a14 (patch) | |
| tree | 2c211d422b9d6c27ab341644531913361b6f1024 /tpl | |
| parent | a381c373b30ed04001ea31ff5c38e077edacaf18 (diff) | |
| download | Shaarli-44acf706812bc77812e6648c2cc28af36e172a14.tar.gz Shaarli-44acf706812bc77812e6648c2cc28af36e172a14.tar.zst Shaarli-44acf706812bc77812e6648c2cc28af36e172a14.zip | |
Refactor login / ban authentication steps
Relates to https://github.com/shaarli/Shaarli/issues/324
Added:
- Add the `LoginManager` class to manage logins and bans
Changed:
- Refactor IP ban management
- Simplify logic
- Avoid using globals, inject dependencies
Fixed:
- Use `ban_duration` instead of `ban_after` when setting a new ban
Signed-off-by: VirtualTam <virtualtam@flibidi.net>
Diffstat (limited to 'tpl')
| -rw-r--r-- | tpl/default/loginform.html | 2 | ||||
| -rw-r--r-- | tpl/vintage/loginform.html | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tpl/default/loginform.html b/tpl/default/loginform.html index 5777a218..d481f452 100644 --- a/tpl/default/loginform.html +++ b/tpl/default/loginform.html | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | </head> | 5 | </head> |
| 6 | <body> | 6 | <body> |
| 7 | {include="page.header"} | 7 | {include="page.header"} |
| 8 | {if="!ban_canLogin($conf)"} | 8 | {if="!$user_can_login"} |
| 9 | <div class="pure-g pure-alert pure-alert-error pure-alert-closable center"> | 9 | <div class="pure-g pure-alert pure-alert-error pure-alert-closable center"> |
| 10 | <div class="pure-u-2-24"></div> | 10 | <div class="pure-u-2-24"></div> |
| 11 | <div class="pure-u-20-24"> | 11 | <div class="pure-u-20-24"> |
diff --git a/tpl/vintage/loginform.html b/tpl/vintage/loginform.html index 1becd44f..2c9b710e 100644 --- a/tpl/vintage/loginform.html +++ b/tpl/vintage/loginform.html | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | <html> | 2 | <html> |
| 3 | <head>{include="includes"}</head> | 3 | <head>{include="includes"}</head> |
| 4 | <body | 4 | <body |
| 5 | {if="ban_canLogin($conf)"} | 5 | {if="$user_can_login"} |
| 6 | {if="empty($username)"} | 6 | {if="empty($username)"} |
| 7 | onload="document.loginform.login.focus();" | 7 | onload="document.loginform.login.focus();" |
| 8 | {else} | 8 | {else} |