diff --git a/phpBB/includes/forums_display.php b/phpBB/includes/forums_display.php
index d995afc9de..e9e7a2ac45 100644
--- a/phpBB/includes/forums_display.php
+++ b/phpBB/includes/forums_display.php
@@ -45,12 +45,12 @@ foreach ($forum_rows as $row)
unset($stored_cat);
}
- if ($auth->get_acl($forum_id, 'forum', 'list'))
+ if ($auth->acl_get('f_list', $forum_id))
{
switch ($forum_status)
{
case ITEM_CATEGORY:
- $folder_image = $theme['forum_locked'];
+ $folder_image = $theme['sub_forum'];
$folder_alt = $lang['Category'];
break;
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 7ba27c61c2..b45eced074 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -68,6 +68,11 @@ function get_db_stat($mode)
return false;
}
+function sql_quote($msg)
+{
+ return str_replace('\'', '\'\'', $msg);
+}
+
function get_userdata($user)
{
global $db;
@@ -75,7 +80,7 @@ function get_userdata($user)
$sql = "SELECT *
FROM " . USERS_TABLE . "
WHERE ";
- $sql .= ( ( is_integer($user) ) ? "user_id = $user" : "username = '" . str_replace("\'", "''", $user) . "'" ) . " AND user_id <> " . ANONYMOUS;
+ $sql .= ( ( is_int($user) ) ? "user_id = $user" : "username = '" . sql_quote($user) . "'" ) . " AND user_id <> " . ANONYMOUS;
$result = $db->sql_query($sql);
return ( $row = $db->sql_fetchrow($result) ) ? $row : false;
@@ -129,30 +134,26 @@ function get_moderators(&$forum_moderators, $forum_id = false)
$sql = "SELECT au.forum_id, u.user_id, u.username
FROM " . ACL_USERS_TABLE . " au, " . ACL_OPTIONS_TABLE . " ao, " . USERS_TABLE . " u
- WHERE ao.auth_value LIKE 'mod_%'
+ WHERE ao.auth_value = 'm_global'
$forum_sql
AND au.auth_option_id = ao.auth_option_id
- AND u.user_id = au.user_id
- GROUP BY au.forum_id, u.user_id, u.username
- ORDER BY au.forum_id, u.user_id";
+ AND u.user_id = au.user_id";
$result = $db->sql_query($sql);
- while( $row = $db->sql_fetchrow($result) )
+ while ( $row = $db->sql_fetchrow($result) )
{
$forum_moderators[$row['forum_id']][] = '' . $row['username'] . '';
}
$sql = "SELECT au.forum_id, g.group_id, g.group_name
FROM " . ACL_GROUPS_TABLE . " au, " . ACL_OPTIONS_TABLE . " ao, " . GROUPS_TABLE . " g
- WHERE ao.auth_value LIKE 'mod_%'
+ WHERE ao.auth_value = 'm_global'
$forum_sql
AND au.auth_option_id = ao.auth_option_id
- AND g.group_id = au.group_id
- GROUP BY au.forum_id, g.group_id, g.group_name
- ORDER BY au.forum_id, g.group_id";
+ AND g.group_id = au.group_id";
$result = $db->sql_query($sql);
- while( $row = $db->sql_fetchrow($result) )
+ while ( $row = $db->sql_fetchrow($result) )
{
$forum_moderators[$row['forum_id']][] = '' . $row['group_name'] . '';
}
@@ -167,13 +168,13 @@ function get_forum_rules($mode, &$rules, &$forum_id)
{
global $SID, $auth, $lang, $phpEx;
- $rules .= ( ( $auth->get_acl($forum_id, 'forum', 'post') ) ? $lang['Rules_post_can'] : $lang['Rules_post_cannot'] ) . '
';
- $rules .= ( ( $auth->get_acl($forum_id, 'forum', 'reply') ) ? $lang['Rules_reply_can'] : $lang['Rules_reply_cannot'] ) . '
';
- $rules .= ( ( $auth->get_acl($forum_id, 'forum', 'edit') ) ? $lang['Rules_edit_can'] : $lang['Rules_edit_cannot'] ) . '
';
- $rules .= ( ( $auth->get_acl($forum_id, 'forum', 'delete') || $auth->get_acl($forum_id, 'mod', 'delete') ) ? $lang['Rules_delete_can'] : $lang['Rules_delete_cannot'] ) . '
';
- $rules .= ( ( $auth->get_acl($forum_id, 'forum', 'attach') ) ? $lang['Rules_attach_can'] : $lang['Rules_attach_cannot'] ) . '
';
+ $rules .= ( ( $auth->acl_get('f_post', $forum_id) ) ? $lang['Rules_post_can'] : $lang['Rules_post_cannot'] ) . '
';
+ $rules .= ( ( $auth->acl_get('f_reply', $forum_id) ) ? $lang['Rules_reply_can'] : $lang['Rules_reply_cannot'] ) . '
';
+ $rules .= ( ( $auth->acl_get('f_edit', $forum_id) ) ? $lang['Rules_edit_can'] : $lang['Rules_edit_cannot'] ) . '
';
+ $rules .= ( ( $auth->acl_get('f_delete', $forum_id) || $auth->acl_get('m_delete', $forum_id) ) ? $lang['Rules_delete_can'] : $lang['Rules_delete_cannot'] ) . '
';
+ $rules .= ( ( $auth->acl_get('f_attach', $forum_id) ) ? $lang['Rules_attach_can'] : $lang['Rules_attach_cannot'] ) . '
';
- if ( $auth->get_acl($forum_id, 'mod') )
+ if ( $auth->acl_get('a_') || $auth->acl_get('m_', $forum_id) )
{
$rules .= sprintf($lang['Rules_moderate'], '', '');
}
@@ -181,63 +182,45 @@ function get_forum_rules($mode, &$rules, &$forum_id)
return;
}
-function make_jumpbox($action, $match_forum_id = 0)
+function make_jumpbox($action, $forum_id = false)
{
- global $SID, $auth, $template, $lang, $db, $nav_links, $phpEx;
+ global $auth, $template, $lang, $db, $nav_links, $phpEx;
-// $sql = "SELECT f.*, p.post_time, p.post_username, u.username, u.user_id
-// FROM (( " . FORUMS_TABLE . " f
-// LEFT JOIN " . POSTS_TABLE . " p ON p.post_id = f.forum_last_post_id )
-// LEFT JOIN " . USERS_TABLE . " u ON u.user_id = p.poster_id )
-// ORDER BY f.forum_id";
-// $result = $db->sql_query($sql);
+ $boxstring = '