diff --git a/README.md b/README.md
index 994b5c8..00028e7 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,9 @@ Try it out yourself here: ([Online Demo](http://vsephpbb.github.io/passwordstren
* Featured MOD of the Week in the phpBB Weekly Podcast, episode #166.
## Minimum Requirements
-* phpBB 3.1.0 or phpBB 3.2.0
+* phpBB 3.1.0
+* phpBB 3.2.0
+* phpBB 3.3.0
* PHP 5.3.3
## Install
@@ -42,4 +44,4 @@ Password Strength is intended to encourage your forum users to use strong passwo
## License
[GNU General Public License v2](http://opensource.org/licenses/GPL-2.0)
-© 2013 - Matt Friedman (VSE)
+© 2013 - Matt Friedman
diff --git a/composer.json b/composer.json
index 81a90ac..8ae5268 100644
--- a/composer.json
+++ b/composer.json
@@ -3,13 +3,13 @@
"type": "phpbb-extension",
"description": "An extension for phpBB that will show users how strong (or weak) their password is as they type it into the password field when creating or updating their account.",
"homepage": "https://github.com/VSEphpbb/passwordstrength",
- "version": "1.2.2",
+ "version": "1.2.3",
"keywords": ["phpbb", "extension", "password", "strength", "zxcvbn"],
- "license": "GPL-2.0",
+ "license": "GPL-2.0-only",
"authors": [
{
- "name": "Matt Friedman (VSE)",
- "homepage": "http://mattfriedman.me",
+ "name": "Matt Friedman",
+ "homepage": "http://vsephpbb.github.io",
"role": "Developer"
}
],
diff --git a/event/listener.php b/event/listener.php
index 76fc72c..c31fda5 100644
--- a/event/listener.php
+++ b/event/listener.php
@@ -88,8 +88,9 @@ public function password_strength_acp_options($event)
'lang' => 'PASSWORD_STRENGTH_TYPE',
'validate' => 'int',
'type' => 'select',
- 'function' => array($this, 'select_password_strength'),
- 'explain' => true
+ 'function' => 'build_select',
+ 'params' => array(array(0 => 'PASSWORD_STRENGTH_TYPE_COMPLEX', 1 => 'PASSWORD_STRENGTH_TYPE_ZXCVBN'), '{CONFIG_VALUE}'),
+ 'explain' => true,
),
);
@@ -98,27 +99,4 @@ public function password_strength_acp_options($event)
$event['display_vars'] = $display_vars;
}
}
-
- /**
- * Select Password Strength type
- *
- * @param string $selected_value
- * @param string $key
- * @return string
- */
- public function select_password_strength($selected_value, $key = '')
- {
- $pws_type_ary = array(
- 0 => 'PASSWORD_STRENGTH_TYPE_COMPLEX',
- 1 => 'PASSWORD_STRENGTH_TYPE_ZXCVBN'
- );
- $pass_char_options = '';
- foreach ($pws_type_ary as $pws_id => $pws_type)
- {
- $selected = ($selected_value == $pws_id) ? ' selected="selected"' : '';
- $pass_char_options .= '';
- }
-
- return $pass_char_options;
- }
}
diff --git a/language/he/acp_passwordstrength.php b/language/he/acp_passwordstrength.php
new file mode 100644
index 0000000..51aae77
--- /dev/null
+++ b/language/he/acp_passwordstrength.php
@@ -0,0 +1,41 @@
+ 'אלגוריתם חוזק הסיסמה',
+ 'PASSWORD_STRENGTH_TYPE_EXPLAIN' => 'בחר אלגוריתם לקביעת חוזק סיסמה.
מורכבות מחפש תווים מעורבים מספרים וסמלים אורך סיסמה ומעודדת סיסמאות מורכבות.
אלגוריתם zxcvbn (מאת DropBox) מחשב כמה קלה הסיסמה שניתנת לניחוש, ומאפשר בכך סיסמאות חזקות וידידותיות למשתמש.',
+ 'PASSWORD_STRENGTH_TYPE_COMPLEX' => 'מורכבות',
+ 'PASSWORD_STRENGTH_TYPE_ZXCVBN' => 'אלגוריתם zxcvbn',
+));
diff --git a/language/he/passwordstrength.php b/language/he/passwordstrength.php
new file mode 100644
index 0000000..5d41f4c
--- /dev/null
+++ b/language/he/passwordstrength.php
@@ -0,0 +1,42 @@
+ 'סיסמה חלשה מאד',
+ 'PS_WEAK' => 'סיסמה חלשה',
+ 'PS_GOOD' => 'סיסמה טובה',
+ 'PS_STRONG' => 'סיסמה חזקה',
+ 'PS_VERY_STRONG' => 'סיסמה חזקה מאד',
+));
diff --git a/styles/all/template/password_strength.html b/styles/all/template/password_strength.html
index a2aaa3c..c583c86 100644
--- a/styles/all/template/password_strength.html
+++ b/styles/all/template/password_strength.html
@@ -26,7 +26,7 @@
{%- endif -%}
showStrength($passField, score);
}
- $passField.bind('keyup blur', trigger).after($resultMsg);
+ $passField.on('keyup blur', trigger).after($resultMsg);
});
};
{% if S_USE_ZXCVBN %}
diff --git a/tests/event/listener_test.php b/tests/event/listener_test.php
index cda8e7d..9db04e5 100644
--- a/tests/event/listener_test.php
+++ b/tests/event/listener_test.php
@@ -164,30 +164,4 @@ public function test_password_strength_acp_options($mode, $display_vars, $expect
$this->assertEquals($expected_keys, $keys);
}
-
- public function select_password_strength_test_data()
- {
- return array(
- array('', ''),
- array('0', ''),
- array('1', ''),
- array('10', ''),
- );
- }
-
- /**
- * @dataProvider select_password_strength_test_data
- */
- public function test_select_password_strength($selected, $expected)
- {
- $this->user->expects($this->any())
- ->method('lang')
- ->will($this->returnArgument(0));
-
- $this->set_listener();
-
- $html = $this->listener->select_password_strength($selected);
-
- $this->assertEquals($expected, $html);
- }
}