diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2011-03-23 23:21:36 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2011-03-23 23:21:36 +0100 |
| commit | c63676e80203df54864d2c5a81d440f44ac53450 (patch) | |
| tree | e8699a1efd8db1a96fd752ec3d17209ff7d2ceb1 /phpBB | |
| parent | 352ed5acf89331548e6cb1a5a32353364942f47c (diff) | |
| parent | 2f6b046f4b2a95b8d0c459d6b1f10833ffe02473 (diff) | |
| download | forums-c63676e80203df54864d2c5a81d440f44ac53450.tar forums-c63676e80203df54864d2c5a81d440f44ac53450.tar.gz forums-c63676e80203df54864d2c5a81d440f44ac53450.tar.bz2 forums-c63676e80203df54864d2c5a81d440f44ac53450.tar.xz forums-c63676e80203df54864d2c5a81d440f44ac53450.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10033] "Disallow usernames" does not check already disallowed names.
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/acp/acp_disallow.php | 12 | ||||
| -rw-r--r-- | phpBB/language/en/acp/posting.php | 4 |
2 files changed, 14 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_disallow.php b/phpBB/includes/acp/acp_disallow.php index e3496bfc8b..f29e902910 100644 --- a/phpBB/includes/acp/acp_disallow.php +++ b/phpBB/includes/acp/acp_disallow.php @@ -56,6 +56,18 @@ class acp_disallow trigger_error($user->lang['NO_USERNAME_SPECIFIED'] . adm_back_link($this->u_action), E_USER_WARNING); } + $sql = 'SELECT disallow_id + FROM ' . DISALLOW_TABLE . " + WHERE disallow_username = '" . $db->sql_escape($disallowed_user) . "'"; + $result = $db->sql_query($sql); + $row = $db->sql_fetchrow($result); + $db->sql_freeresult($result); + + if ($row) + { + trigger_error($user->lang['DISALLOWED_ALREADY'] . adm_back_link($this->u_action), E_USER_WARNING); + } + $sql = 'INSERT INTO ' . DISALLOW_TABLE . ' ' . $db->sql_build_array('INSERT', array('disallow_username' => $disallowed_user)); $db->sql_query($sql); diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php index b0f1b74faa..df573eb853 100644 --- a/phpBB/language/en/acp/posting.php +++ b/phpBB/language/en/acp/posting.php @@ -233,13 +233,13 @@ $lang = array_merge($lang, array( // Disallow Usernames $lang = array_merge($lang, array( - 'ACP_DISALLOW_EXPLAIN' => 'Here you can control usernames which will not be allowed to be used. Disallowed usernames are allowed to contain a wildcard character of *. Please note that you will not be allowed to specify any username that has already been registered, you must first delete that name then disallow it.', + 'ACP_DISALLOW_EXPLAIN' => 'Here you can control usernames which will not be allowed to be used. Disallowed usernames are allowed to contain a wildcard character of *.', 'ADD_DISALLOW_EXPLAIN' => 'You can disallow a username using the wildcard character * to match any character.', 'ADD_DISALLOW_TITLE' => 'Add a disallowed username', 'DELETE_DISALLOW_EXPLAIN' => 'You can remove a disallowed username by selecting the username from this list and clicking submit.', 'DELETE_DISALLOW_TITLE' => 'Remove a disallowed username', - 'DISALLOWED_ALREADY' => 'The name you entered could not be disallowed. It either already exists in the list, exists in the word censor list, or a matching username is present.', + 'DISALLOWED_ALREADY' => 'The name you entered is already disallowed.', 'DISALLOWED_DELETED' => 'The disallowed username has been successfully removed.', 'DISALLOW_SUCCESSFUL' => 'The disallowed username has been successfully added.', |