diff options
| author | Arthur <arthur@hoa.ro> | 2016-12-16 12:23:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-16 12:23:47 +0100 |
| commit | e3ffc8fdee30be41046b985fe6e7034fb580b0c8 (patch) | |
| tree | 4ed9096bf2c77d0479f72a01f198f20fa01f7ae4 | |
| parent | c0d96ce59005e83cd210065620aa6f3bb96e4f81 (diff) | |
| parent | 4cfe8d330319d83c3024a4149afeca0138922fda (diff) | |
| download | Shaarli-e3ffc8fdee30be41046b985fe6e7034fb580b0c8.tar.gz Shaarli-e3ffc8fdee30be41046b985fe6e7034fb580b0c8.tar.zst Shaarli-e3ffc8fdee30be41046b985fe6e7034fb580b0c8.zip | |
Merge pull request #714 from ArthurHoaro/hotfix/banlogin
Fixes can login function call in loginform.html
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | tpl/loginform.html | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 9ffb3d00..6ff1b20f 100644 --- a/.travis.yml +++ b/.travis.yml | |||
| @@ -4,6 +4,7 @@ cache: | |||
| 4 | directories: | 4 | directories: |
| 5 | - $HOME/.composer/cache | 5 | - $HOME/.composer/cache |
| 6 | php: | 6 | php: |
| 7 | - 7.1 | ||
| 7 | - 7.0 | 8 | - 7.0 |
| 8 | - 5.6 | 9 | - 5.6 |
| 9 | - 5.5 | 10 | - 5.5 |
diff --git a/tpl/loginform.html b/tpl/loginform.html index a49b42d3..84176385 100644 --- a/tpl/loginform.html +++ b/tpl/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()"} | 5 | {if="ban_canLogin($conf)"} |
| 6 | {if="empty($username)"} | 6 | {if="empty($username)"} |
| 7 | onload="document.loginform.login.focus();" | 7 | onload="document.loginform.login.focus();" |
| 8 | {else} | 8 | {else} |
| @@ -13,7 +13,7 @@ | |||
| 13 | {include="page.header"} | 13 | {include="page.header"} |
| 14 | 14 | ||
| 15 | <div id="headerform"> | 15 | <div id="headerform"> |
| 16 | {if="!ban_canLogin()"} | 16 | {if="!ban_canLogin($conf)"} |
| 17 | You have been banned from login after too many failed attempts. Try later. | 17 | You have been banned from login after too many failed attempts. Try later. |
| 18 | {else} | 18 | {else} |
| 19 | <form method="post" name="loginform"> | 19 | <form method="post" name="loginform"> |