This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, master has been updated
via 2570526260a63012d5dbe6b156b09c1e5d6f3034 (commit)
via 1f38717787a7e6e652a28e86663aa2815ded9558 (commit)
from addfb9ca15447b8879d2d64c5bcb36a6ac242218 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=2570526260a63012d5dbe6b156b09c1e5d6f3034
commit 2570526260a63012d5dbe6b156b09c1e5d6f3034
Author: Franck Villaume <[email protected]>
Date: Sun Oct 18 18:44:11 2015 +0200
fix typo
diff --git a/src/www/include/login-form.php b/src/www/include/login-form.php
index 7047cc1..d64159e 100644
--- a/src/www/include/login-form.php
+++ b/src/www/include/login-form.php
@@ -39,11 +39,11 @@ function validate_return_to(&$return_to = '/') {
$return_to = $newrt;
}
-function display_login_page($return_to = '/', $triggered = false, $attemps =
1, $previousLogin = null) {
- display_login_form($return_to, $triggered, true, $attemps,
$previousLogin);
+function display_login_page($return_to = '/', $triggered = false, $attempts =
1, $previousLogin = null) {
+ display_login_form($return_to, $triggered, true, $attempts,
$previousLogin);
}
-function display_login_form($return_to = '/', $triggered = false, $full_page =
false, $attemps = 1, $previousLogin = null) {
+function display_login_form($return_to = '/', $triggered = false, $full_page =
false, $attempts = 1, $previousLogin = null) {
global $HTML;
validate_return_to($return_to);
@@ -52,7 +52,7 @@ function display_login_form($return_to = '/', $triggered =
false, $full_page = f
$params['return_to'] = $return_to;
$params['html_snippets'] = array();
$params['transparent_redirect_urls'] = array();
- $params['attempts'] = $attemps;
+ $params['attempts'] = $attempts;
$params['previousLogin'] = $previousLogin;
plugin_hook_by_reference('display_auth_form', $params);
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=1f38717787a7e6e652a28e86663aa2815ded9558
commit 1f38717787a7e6e652a28e86663aa2815ded9558
Author: Franck Villaume <[email protected]>
Date: Sun Oct 18 18:42:47 2015 +0200
implement [#795]: fix attempts check
diff --git a/src/plugins/authbuiltin/www/post-login.php
b/src/plugins/authbuiltin/www/post-login.php
index feb7e0c..a4a3231 100644
--- a/src/plugins/authbuiltin/www/post-login.php
+++ b/src/plugins/authbuiltin/www/post-login.php
@@ -82,8 +82,10 @@ if ($login) {
}
$valide = 1;
- $params['valide'] =& $valide;
- plugin_hook('captcha_check', $params);
+ if ($attempts >= 3) {
+ $params['valide'] =& $valide;
+ plugin_hook('captcha_check', $params);
+ }
if (session_check_credentials_in_database(strtolower($form_loginname),
$form_pw, false) && $valide) {
if ($plugin->isSufficient()) {
$plugin->startSession($form_loginname);
diff --git a/src/www/include/login-form.php b/src/www/include/login-form.php
index 33b018d..7047cc1 100644
--- a/src/www/include/login-form.php
+++ b/src/www/include/login-form.php
@@ -52,7 +52,7 @@ function display_login_form($return_to = '/', $triggered =
false, $full_page = f
$params['return_to'] = $return_to;
$params['html_snippets'] = array();
$params['transparent_redirect_urls'] = array();
- $params['attemps'] = $attemps;
+ $params['attempts'] = $attemps;
$params['previousLogin'] = $previousLogin;
plugin_hook_by_reference('display_auth_form', $params);
-----------------------------------------------------------------------
Summary of changes:
src/plugins/authbuiltin/www/post-login.php | 6 ++++--
src/www/include/login-form.php | 8 ++++----
2 files changed, 8 insertions(+), 6 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
