aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorArthurHoaro <arthur@hoa.ro>2016-12-15 10:57:11 +0100
committerArthurHoaro <arthur@hoa.ro>2016-12-15 10:57:11 +0100
commit4cfe8d330319d83c3024a4149afeca0138922fda (patch)
tree484af181795c24ffa798575690f700405f540639
parent624f999fb75ceeefbc690276f42e5a545ad35357 (diff)
downloadShaarli-4cfe8d330319d83c3024a4149afeca0138922fda.tar.gz
Shaarli-4cfe8d330319d83c3024a4149afeca0138922fda.tar.zst
Shaarli-4cfe8d330319d83c3024a4149afeca0138922fda.zip
Fixes can login function call in loginform.html
Fixes #711
-rw-r--r--.travis.yml1
-rw-r--r--tpl/loginform.html4
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
6php: 6php:
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">