From 324bfbde30d632bcd19009dbca1cb68cb160fbc1 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Thu, 18 Feb 2016 02:39:23 -0500
Subject: [PATCH] Merge branch 'master' into 'stable-3.1'
---
interface/lib/classes/validate_password.inc.php | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/interface/lib/classes/validate_password.inc.php b/interface/lib/classes/validate_password.inc.php
index 998c37c..f36f162 100644
--- a/interface/lib/classes/validate_password.inc.php
+++ b/interface/lib/classes/validate_password.inc.php
@@ -33,6 +33,7 @@
private function _get_password_strength($password) {
$length = strlen($password);
+
$points = 0;
if ($length < 5) {
return 1;
@@ -53,10 +54,11 @@
$different += 1;
}
- if (preg_match('/[`~!@#$%^&*()_+|\\=-[]}{\';:\/?.>,<" ]/', $password)) {
+ if (preg_match('/[`~!@#$%^&*()_+|\\=\-\[\]}{\';:\/?.>,<" ]/', $password)) {
$points += 1;
$different += 1;
}
+
if ($points == 0 || $different < 3) {
if ($length >= 5 && $length <= 6) {
@@ -122,7 +124,7 @@
$lng_text = str_replace('{chars}', $min_password_length, $lng_text);
}
if(!$lng_text) $lng_text = 'weak_password_txt'; // always return a string, even if language is missing - otherwise validator is NOT MATCHING!
-
+
if(strlen($field_value) < $min_password_length) return $lng_text;
if($this->_get_password_strength($field_value) < $min_password_strength) return $lng_text;
--
Gitblit v1.9.1