aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_convert.php
diff options
context:
space:
mode:
authorDavid M <davidmj@users.sourceforge.net>2008-01-08 06:44:05 +0000
committerDavid M <davidmj@users.sourceforge.net>2008-01-08 06:44:05 +0000
commit370e189f156730f3ea602052737fb6995c85c23c (patch)
treedac369961ff10f5a31f6ad40318afb8702b31e4d /phpBB/includes/functions_convert.php
parentb4e64655afc6279d7c64a952ee5f43fe65751c19 (diff)
downloadforums-370e189f156730f3ea602052737fb6995c85c23c.tar
forums-370e189f156730f3ea602052737fb6995c85c23c.tar.gz
forums-370e189f156730f3ea602052737fb6995c85c23c.tar.bz2
forums-370e189f156730f3ea602052737fb6995c85c23c.tar.xz
forums-370e189f156730f3ea602052737fb6995c85c23c.zip
- make viewforum work again
- remove the lower case functions, they were stupid anyway - added some indexes - added a group_name_clean column git-svn-id: file:///svn/phpbb/trunk@8315 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_convert.php')
-rw-r--r--phpBB/includes/functions_convert.php11
1 files changed, 6 insertions, 5 deletions
diff --git a/phpBB/includes/functions_convert.php b/phpBB/includes/functions_convert.php
index 7498882e7c..cbf5bdbac2 100644
--- a/phpBB/includes/functions_convert.php
+++ b/phpBB/includes/functions_convert.php
@@ -1141,7 +1141,7 @@ function user_group_auth($group, $select_query, $use_src_db)
$sql = 'SELECT group_id
FROM ' . GROUPS_TABLE . "
- WHERE group_name = '" . $db->sql_escape(strtoupper($group)) . "'";
+ WHERE group_name_clean = '" . $db->sql_escape(utf8_clean_string($group)) . "'";
$result = $db->sql_query($sql);
$group_id = (int) $db->sql_fetchfield('group_id');
$db->sql_freeresult($result);
@@ -1474,7 +1474,7 @@ function mass_auth($ug_type, $forum_id, $ug_id, $acl_list, $setting = ACL_NO)
{
$sql = 'SELECT group_id
FROM ' . GROUPS_TABLE . "
- WHERE group_name = '" . $db->sql_escape(strtoupper($ug_id)) . "'";
+ WHERE group_name_clean = '" . $db->sql_escape(utf8_clean_string($ug_id)) . "'";
$result = $db->sql_query_limit($sql, 1);
$id = (int) $db->sql_fetchfield('group_id');
$db->sql_freeresult($result);
@@ -1702,7 +1702,7 @@ function add_default_groups()
$sql = 'SELECT *
FROM ' . GROUPS_TABLE . '
- WHERE ' . $db->sql_in_set('group_name', array_keys($default_groups));
+ WHERE ' . $db->sql_in_set('group_name_clean', array_map('utf8_clean_string', array_keys($default_groups));
$result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result))
@@ -1717,6 +1717,7 @@ function add_default_groups()
{
$sql_ary[] = array(
'group_name' => (string) $name,
+ 'group_name_clean' => (string) utf8_clean_string($name),
'group_desc' => '',
'group_desc_uid' => '',
'group_desc_bitfield' => '',
@@ -1766,7 +1767,7 @@ function add_bots()
$db->sql_query($convert->truncate_statement . BOTS_TABLE);
- $sql = 'SELECT group_id FROM ' . GROUPS_TABLE . " WHERE group_name = 'BOTS'";
+ $sql = 'SELECT group_id FROM ' . GROUPS_TABLE . " WHERE group_name_clean = 'bots'";
$result = $db->sql_query($sql);
$group_id = (int) $db->sql_fetchfield('group_id', false, $result);
$db->sql_freeresult($result);
@@ -1775,7 +1776,7 @@ function add_bots()
{
add_default_groups();
- $sql = 'SELECT group_id FROM ' . GROUPS_TABLE . " WHERE group_name = 'BOTS'";
+ $sql = 'SELECT group_id FROM ' . GROUPS_TABLE . " WHERE group_name_clean = 'bots'";
$result = $db->sql_query($sql);
$group_id = (int) $db->sql_fetchfield('group_id', false, $result);
$db->sql_freeresult($result);