1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00

- bugfix roll

- fixed sql_query_limit on mssql/mssql_odbc


git-svn-id: file:///svn/phpbb/trunk@6024 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2006-06-08 20:26:03 +00:00
parent 580a318d16
commit ef08df5675
10 changed files with 86 additions and 28 deletions

View File

@@ -45,7 +45,7 @@ class ucp_zebra
if ($data['add'] && !sizeof($error))
{
$data['add'] = explode("\n", $data['add']);
$data['add'] = array_map('strtolower', explode("\n", $data['add']));
// Do these name/s exist on a list already? If so, ignore ... we could be
// 'nice' and automatically handle names added to one list present on
@@ -62,16 +62,16 @@ class ucp_zebra
{
if ($row['friend'])
{
$friends[] = $row['username'];
$friends[] = strtolower($row['username']);
}
else
{
$foes[] = $row['username'];
$foes[] = strtolower($row['username']);
}
}
$db->sql_freeresult($result);
$data['add'] = array_diff($data['add'], $friends, $foes, array($user->data['username']));
$data['add'] = array_diff($data['add'], $friends, $foes, array(strtolower($user->data['username'])));
unset($friends, $foes);
$data['add'] = implode(', ', preg_replace('#^[\s]*?(.*?)[\s]*?$#e', "\"'\" . \$db->sql_escape('\\1') . \"'\"", $data['add']));
@@ -80,7 +80,7 @@ class ucp_zebra
{
$sql = 'SELECT user_id, user_type
FROM ' . USERS_TABLE . '
WHERE username IN (' . $data['add'] . ')
WHERE LOWER(username) IN (' . $data['add'] . ')
AND user_type NOT IN (' . USER_IGNORE . ', ' . USER_INACTIVE . ')';
$result = $db->sql_query($sql);