Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #714 from ArthurHoaro/hotfix/banlogin

Browse source 
Fixes can login function call in loginform.html
This commit is contained in:
Arthur 2016-12-16 12:23:47 +01:00 committed by GitHub
commit e3ffc8fdee
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.travis.yml
View file

@ -4,6 +4,7 @@ cache:
directories: directories:
- $HOME/.composer/cache - $HOME/.composer/cache
php: php:
- 7.1
- 7.0 - 7.0
- 5.6 - 5.6
- 5.5 - 5.5

4
tpl/loginform.html
View file

@ -2,7 +2,7 @@
<html> <html>
<head>{include="includes"}</head> <head>{include="includes"}</head>
<body <body
{if="ban_canLogin()"} {if="ban_canLogin($conf)"}
{if="empty($username)"} {if="empty($username)"}
onload="document.loginform.login.focus();" onload="document.loginform.login.focus();"
{else} {else}
@ -13,7 +13,7 @@
{include="page.header"} {include="page.header"}
<div id="headerform"> <div id="headerform">
{if="!ban_canLogin()"} {if="!ban_canLogin($conf)"}
You have been banned from login after too many failed attempts. Try later. You have been banned from login after too many failed attempts. Try later.
{else} {else}
<form method="post" name="loginform"> <form method="post" name="loginform">