From c3f2302be71d4b3bc2dd4cc67dd16c4505203498 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 22 Jul 2017 15:47:13 +0200
Subject: Update username constraints

https://github.com/FreshRSS/FreshRSS/issues/1597
---
 cli/create-user.php | 2 +-
 cli/do-install.php  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'cli')

diff --git a/cli/create-user.php b/cli/create-user.php
index c9e350c14..f44591cc9 100755
--- a/cli/create-user.php
+++ b/cli/create-user.php
@@ -18,7 +18,7 @@ if (empty($options['user'])) {
 }
 $username = $options['user'];
 if (!FreshRSS_user_Controller::checkUsername($username)) {
-	fail('FreshRSS error: invalid username “' . $username . '”');
+	fail('FreshRSS error: invalid username “' . $username . '”! Must be matching ' . FreshRSS_user_Controller::USERNAME_PATTERN);
 }
 
 $usernames = listUsers();
diff --git a/cli/do-install.php b/cli/do-install.php
index 143ca5c3e..54e3c3d4f 100755
--- a/cli/do-install.php
+++ b/cli/do-install.php
@@ -81,11 +81,11 @@ if ($requirements['all'] !== 'ok') {
 }
 
 if (!FreshRSS_user_Controller::checkUsername($options['default_user'])) {
-	fail('FreshRSS invalid default username (must be ASCII alphanumeric): ' . $options['default_user']);
+	fail('FreshRSS error: invalid default username “' . $options['default_user'] . '”! Must be matching ' . FreshRSS_user_Controller::USERNAME_PATTERN);
 }
 
 if (isset($options['auth_type']) && !in_array($options['auth_type'], array('form', 'http_auth', 'none'))) {
-	fail('FreshRSS invalid authentication method (auth_type must be one of { form, http_auth, none }: ' . $options['auth_type']);
+	fail('FreshRSS invalid authentication method (auth_type must be one of { form, http_auth, none }): ' . $options['auth_type']);
 }
 
 if (file_put_contents(join_path(DATA_PATH, 'config.php'), "<?php\n return " . var_export($config, true) . ";\n") === false) {
-- 
cgit v1.2.3