mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 08:47:45 +02:00
Code Issues Releases Wiki Activity

- fixing some bugs, containing fixes for anonymous username displays, eaccelerator issue, permission trace and a few smaller bugs.

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@5858 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2006-04-29 01:18:57 +00:00
parent 656274cd57
commit 7bc05c5e24
22 changed files with 332 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
phpBB/includes/acp/acp_email.php
View File

@@ -194,14 +194,16 @@ class acp_email
}
}
// Initial selection
$sql = 'SELECT group_id, group_type, group_name
FROM ' . GROUPS_TABLE . '
ORDER BY group_type DESC, group_name ASC';
// Exclude bots...
$sql = 'SELECT group_id
FROM ' . GROUPS_TABLE . "
WHERE group_name = 'BOTS'";
$result = $db->sql_query($sql);
$bot_group_id = (int) $db->sql_fetchfield('group_id');
$db->sql_freeresult($result);
$select_list = '<option value="0"' . ((!$group_id) ? ' selected="selected"' : '') . '>' . $user->lang['ALL_USERS'] . '</option>';
$select_list .= group_select_options($group_id);
$select_list .= group_select_options($group_id, array($bot_group_id));
$s_priority_options = '<option value="' . MAIL_LOW_PRIORITY . '">' . $user->lang['MAIL_LOW_PRIORITY'] . '</option>';
$s_priority_options .= '<option value="' . MAIL_NORMAL_PRIORITY . '" selected="selected">' . $user->lang['MAIL_NORMAL_PRIORITY'] . '</option>';

32
phpBB/includes/acp/acp_permissions.php
View File

@@ -861,14 +861,14 @@ class acp_permissions
{
foreach ($forum_ary as $auth_option => $user_ary)
{
$perms += $user_ary;
$perms = array_merge($perms, $user_ary);
}
}
if (sizeof($perms))
{
$sql = 'DELETE FROM ' . ZEBRA_TABLE . '
WHERE zebra_id IN (' . implode(', ', $perms) . ')
WHERE zebra_id IN (' . implode(', ', array_unique($perms)) . ')
AND foe = 1';
$db->sql_query($sql);
}
@@ -882,21 +882,21 @@ class acp_permissions
{
global $db, $template, $user, $auth;
$sql = 'SELECT username
$sql = 'SELECT user_id, username, user_type
FROM ' . USERS_TABLE . '
WHERE user_id = ' . $user_id;
$result = $db->sql_query($sql);
$username = (string) $db->sql_fetchfield('username');
$user_row = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
if (!$username)
if (!$user_row)
{
trigger_error('NO_USERS');
}
$template->assign_vars(array(
'PERMISSION' => $user->lang['acl_' . $permission]['lang'],
'PERMISSION_USERNAME' => $username)
'PERMISSION_USERNAME' => $user_row['username'])
);
$template->assign_block_vars('trace', array(
@@ -990,9 +990,9 @@ class acp_permissions
$total = ACL_NO;
break;
}
$template->assign_block_vars('trace', array(
'WHO' => $username,
'WHO' => $user_row['username'],
'INFORMATION' => $information,
'S_SETTING_UNSET' => ($auth_setting == ACL_UNSET) ? true : false,
@@ -1002,6 +1002,22 @@ class acp_permissions
'S_TOTAL_YES' => ($total == ACL_YES) ? true : false,
'S_TOTAL_NO' => ($total == ACL_NO) ? true : false)
);
// Take founder status into account, overwriting the default values
if ($user_row['user_type'] == USER_FOUNDER && strpos($permission, 'a_') === 0)
{
$template->assign_block_vars('trace', array(
'WHO' => $user_row['username'],
'INFORMATION' => $user->lang['TRACE_USER_FOUNDER'],
'S_SETTING_UNSET' => ($auth_setting == ACL_UNSET) ? true : false,
'S_SETTING_YES' => ($auth_setting == ACL_YES) ? true : false,
'S_SETTING_NO' => ($auth_setting == ACL_NO) ? true : false,
'S_TOTAL_UNSET' => false,
'S_TOTAL_YES' => true,
'S_TOTAL_NO' => false)
);
}
}
}

4
phpBB/includes/acp/acp_users.php
View File

@@ -1302,6 +1302,10 @@ class acp_users
$filename = '';
$type = $width = $height = 0;
}
else
{
$data = array();
}
}
if (!sizeof($error))