Nemcio/Grav-Admin-Plugin
1
0
Fork 0
mirror of https://github.com/getgrav/grav-plugin-admin.git synced 2026-05-07 00:57:25 +02:00
Code Issues Packages Projects Releases Activity

Use new password and username regex from grav system config

Browse Source 
# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Andy Miller
2017-04-13 14:56:32 -06:00
parent 8cffa71cc6
commit 46afadf5d4
4 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
admin.php
View File

@@ -155,16 +155,19 @@ class AdminPlugin extends Plugin
*/
protected function validate($type, $value, $extra = '')
{
$username_regex = '/' . $this->config->get('system.username_regex') . '/';
$pwd_regex = '/' . $this->config->get('system.pwd_regex') . '/';
switch ($type) {
case 'username_format':
if (!preg_match('/^[a-z0-9_-]{3,16}$/', $value)) {
if (!preg_match($username_regex, $value)) {
return false;
}
return true;
case 'password1':
if (!preg_match('/(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}/', $value)) {
if (!preg_match($pwd_regex, $value)) {
return false;
}