[Fusionforge-commits] FusionForge branch master updated. v6.0.3-246-g50e352e

[Sylvain Beucler]

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  50e352e096a2bd22a56302c0f80c586ae29c31f1 (commit)
      from  2eaaaaab6b15e459869196313840f5bd029e3dda (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=50e352e096a2bd22a56302c0f80c586ae29c31f1

commit 50e352e096a2bd22a56302c0f80c586ae29c31f1
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Wed Nov 25 11:00:14 2015 +0100

    account: up min password length to 8

diff --git a/src/CHANGES b/src/CHANGES
index 914128c..e4ad7c7 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,4 +1,5 @@
 FusionForge 6.X:
+* Accounts: minimum password length is now 8
 * Spellcheck (Anders Jonsson)
 * Site Admin: add paging system in userlist page [#799] (TrivialDev)
 * Docman: limit number of returned documents on search query [#794] (TrivialDev)
diff --git a/src/common/include/account.php b/src/common/include/account.php
index 1d5d3db..b458d2b 100644
--- a/src/common/include/account.php
+++ b/src/common/include/account.php
@@ -31,8 +31,8 @@
  *
  */
 function account_pwvalid($pw) {
-	if (strlen($pw) < 6) {
-		$GLOBALS['register_error'] = _('Password must be at least 6 characters.');
+	if (strlen($pw) < 8) {
+		$GLOBALS['register_error'] = _('Password must be at least 8 characters.');
 		return 0;
 	}
 	return 1;
diff --git a/tests/func/SeleniumForge.php b/tests/func/SeleniumForge.php
index 837b305..a5e0fb5 100644
--- a/tests/func/SeleniumForge.php
+++ b/tests/func/SeleniumForge.php
@@ -45,7 +45,7 @@
  */
 
 define('FORGE_ADMIN_USERNAME', 'admin');
-define('FORGE_ADMIN_PASSWORD', 'myadmin');
+define('FORGE_ADMIN_PASSWORD', 'my%admin');
 define('FORGE_OTHER_PASSWORD', 'tototata');
 
 $config = dirname(__FILE__).'/config.php';
diff --git a/tests/func/fixtures.sh b/tests/func/fixtures.sh
index 9b703d7..b243cc7 100755
--- a/tests/func/fixtures.sh
+++ b/tests/func/fixtures.sh
@@ -131,7 +131,7 @@ if [ "$reset" = 1 ]; then
     service postgresql restart
     su - postgres -c "dropdb $database" || true
     $(forge_get_config source_path)/post-install.d/db/db.sh configure
-    forge_set_password admin myadmin
+    forge_set_password admin 'my%admin'
     service fusionforge-systasksd start
     start_apache
     rm -rf $pgdir.backup-*/

-----------------------------------------------------------------------

Summary of changes:
 src/CHANGES                    | 1 +
 src/common/include/account.php | 4 ++--
 tests/func/SeleniumForge.php   | 2 +-
 tests/func/fixtures.sh         | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
FusionForge