aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_board.php
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2006-12-27 00:06:39 +0000
committerNils Adermann <naderman@naderman.de>2006-12-27 00:06:39 +0000
commitb41365fcd41fc185fe197667d2f0bec13f6c30c2 (patch)
treee7746c0e1e870e82a62bb52f08cdb10977059d56 /phpBB/includes/acp/acp_board.php
parent677dc5d2e11c3209fcaf798e4b44588a9305328f (diff)
downloadforums-b41365fcd41fc185fe197667d2f0bec13f6c30c2.tar
forums-b41365fcd41fc185fe197667d2f0bec13f6c30c2.tar.gz
forums-b41365fcd41fc185fe197667d2f0bec13f6c30c2.tar.bz2
forums-b41365fcd41fc185fe197667d2f0bec13f6c30c2.tar.xz
forums-b41365fcd41fc185fe197667d2f0bec13f6c30c2.zip
- display search type as page title for premade searches [Bug #6508]
- flash enabled on user side by default, so that admins can actually change anything by activating it (still disabled by default) - properly implemented password complexity check [Bug #6584] - do not ldap_escape paramaters for the bind function [Bug #6208] - deleted words in edited post subjects weren't getting there search cache refreshed [Bug #6288] - made common word threshold configurable [Bug #6168] - recreated word match table entries after installation, side effect of bug #6060 - option to only allow ASCII usernames - adjusted search page pagination [Bug #6424] - correctly calculate unformatted search result extract length git-svn-id: file:///svn/phpbb/trunk@6814 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_board.php')
-rw-r--r--phpBB/includes/acp/acp_board.php11
1 files changed, 6 insertions, 5 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index 9638accc26..7cd50d004e 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -668,7 +668,8 @@ class acp_board
{
global $user;
- $user_char_ary = array('USERNAME_CHARS_ANY' => '.*', 'USERNAME_ALPHA_ONLY' => '[\w]+', 'USERNAME_ALPHA_SPACERS' => '[\w_\+\. \-\[\]]+');
+ $user_char_ary = array('USERNAME_CHARS_ANY' => '.*', 'USERNAME_ALPHA_ONLY' => '[a-z]+', 'USERNAME_ALPHA_SPACERS' => '[-\]_+ [a-z]+', 'USERNAME_LETTER_NUM' => '\w+', 'USERNAME_LETTER_NUM_SPACERS' => '[-\]_+ [\w]+', 'USERNAME_ASCII' => '[\x01-\x7F]+');
+
$user_char_options = '';
foreach ($user_char_ary as $lang => $value)
{
@@ -696,12 +697,12 @@ class acp_board
{
global $user;
- $pass_type_ary = array('PASS_TYPE_ANY' => '.*', 'PASS_TYPE_CASE' => '[a-zA-Z]', 'PASS_TYPE_ALPHA' => '[a-zA-Z0-9]', 'PASS_TYPE_SYMBOL' => '[a-zA-Z\W]');
+ $pass_type_ary = array('PASS_TYPE_ANY', 'PASS_TYPE_CASE', 'PASS_TYPE_ALPHA', 'PASS_TYPE_SYMBOL');
$pass_char_options = '';
- foreach ($pass_type_ary as $lang => $value)
+ foreach ($pass_type_ary as $pass_type)
{
- $selected = ($selected_value == $value) ? ' selected="selected"' : '';
- $pass_char_options .= '<option value="' . $value . '"' . $selected . '>' . $user->lang[$lang] . '</option>';
+ $selected = ($selected_value == $pass_type) ? ' selected="selected"' : '';
+ $pass_char_options .= '<option value="' . $pass_type . '"' . $selected . '>' . $user->lang[$pass_type] . '</option>';
}
return $pass_char_options;