aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_groups.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-02-18 13:42:08 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-02-18 13:42:08 +0000
commit5c6653717f0a9adce905d1417c8adb4f0f3a5b73 (patch)
treec5e3b65b409ae33d52055e33cfed0ee169684023 /phpBB/includes/acp/acp_groups.php
parent652d349b75262dd8e0db8405d5ca1b7fa654364a (diff)
downloadforums-5c6653717f0a9adce905d1417c8adb4f0f3a5b73.tar
forums-5c6653717f0a9adce905d1417c8adb4f0f3a5b73.tar.gz
forums-5c6653717f0a9adce905d1417c8adb4f0f3a5b73.tar.bz2
forums-5c6653717f0a9adce905d1417c8adb4f0f3a5b73.tar.xz
forums-5c6653717f0a9adce905d1417c8adb4f0f3a5b73.zip
fixing some bugs
more mcp links for easier moderating different aspects (all, forum, topic) i may have introduced new bugs with this commit due to me having fixed some things weeks ago and some code changed in between - please report if you see something not working as expected. git-svn-id: file:///svn/phpbb/trunk@7007 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_groups.php')
-rw-r--r--phpBB/includes/acp/acp_groups.php95
1 files changed, 37 insertions, 58 deletions
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index 7147431259..2645ac4ce3 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -272,16 +272,13 @@ class acp_groups
'receive_pm' => isset($_REQUEST['group_receive_pm']) ? 1 : 0,
'legend' => isset($_REQUEST['group_legend']) ? 1 : 0,
'message_limit' => request_var('group_message_limit', 0),
+ 'founder_manage' => 0,
);
if ($user->data['user_type'] == USER_FOUNDER)
{
$submit_ary['founder_manage'] = isset($_REQUEST['group_founder_manage']) ? 1 : 0;
}
- else
- {
- $submit_ary['founder_manage'] = 0;
- }
if (!empty($_FILES['uploadfile']['tmp_name']) || $data['uploadurl'] || $data['remotelink'])
{
@@ -318,6 +315,11 @@ class acp_groups
$submit_ary['avatar'] = $category . '/' . $avatar_select;
}
}
+ else if ($delete)
+ {
+ $submit_ary['avatar'] = '';
+ $submit_ary['avatar_type'] = $submit_ary['avatar_width'] = $submit_ary['avatar_height'] = 0;
+ }
else if ($data['width'] && $data['height'])
{
// Only update the dimensions?
@@ -346,11 +348,6 @@ class acp_groups
$submit_ary['avatar_height'] = $data['height'];
}
}
- else if ($delete)
- {
- $submit_ary['avatar'] = '';
- $submit_ary['avatar_type'] = $submit_ary['avatar_width'] = $submit_ary['avatar_height'] = 0;
- }
if ((isset($submit_ary['avatar']) && $submit_ary['avatar'] && (!isset($group_row['group_avatar']) || $group_row['group_avatar'] != $submit_ary['avatar'])) || $delete)
{
@@ -593,53 +590,38 @@ class acp_groups
$this->page_title = 'GROUP_MEMBERS';
- // Total number of group leaders
- $sql = 'SELECT COUNT(user_id) AS total_leaders
- FROM ' . USER_GROUP_TABLE . "
- WHERE group_id = $group_id
- AND group_leader = 1";
- $result = $db->sql_query($sql);
- $total_leaders = (int) $db->sql_fetchfield('total_leaders');
- $db->sql_freeresult($result);
-
- // Total number of group members (non-leaders)
- $sql = 'SELECT COUNT(user_id) AS total_members
- FROM ' . USER_GROUP_TABLE . "
- WHERE group_id = $group_id
- AND group_leader <> 1";
- $result = $db->sql_query($sql);
- $total_members = (int) $db->sql_fetchfield('total_members');
- $db->sql_freeresult($result);
-
- // Grab the members
+ // Grab the leaders - always, on every page...
$sql = 'SELECT u.user_id, u.username, u.username_clean, u.user_regdate, u.user_posts, u.group_id, ug.group_leader, ug.user_pending
FROM ' . USERS_TABLE . ' u, ' . USER_GROUP_TABLE . " ug
WHERE ug.group_id = $group_id
- AND u.user_id = ug.user_id
+ AND u.user_id = ug.user_id
+ AND ug.group_leader = 1
ORDER BY ug.group_leader DESC, ug.user_pending ASC, u.username_clean";
- $result = $db->sql_query_limit($sql, $config['topics_per_page'], $start);
-
- $leader = $member = 0;
- $group_data = array(
- 'leader' => array(),
- 'member' => array(),
- );
+ $result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result))
{
- $type = ($row['group_leader']) ? 'leader' : 'member';
-
- $group_data[$type][$$type]['user_id'] = $row['user_id'];
- $group_data[$type][$$type]['group_id'] = $row['group_id'];
- $group_data[$type][$$type]['username'] = $row['username'];
- $group_data[$type][$$type]['user_regdate'] = $row['user_regdate'];
- $group_data[$type][$$type]['user_posts'] = $row['user_posts'];
- $group_data[$type][$$type]['user_pending'] = ($row['user_pending']) ? 1 : 0;
+ $template->assign_block_vars('leader', array(
+ 'U_USER_EDIT' => append_sid("{$phpbb_admin_path}index.$phpEx", "i=users&amp;action=edit&amp;u={$row['user_id']}"),
- $$type++;
+ 'USERNAME' => $row['username'],
+ 'S_GROUP_DEFAULT' => ($row['group_id'] == $group_id) ? true : false,
+ 'JOINED' => ($row['user_regdate']) ? $user->format_date($row['user_regdate']) : ' - ',
+ 'USER_POSTS' => $row['user_posts'],
+ 'USER_ID' => $row['user_id'])
+ );
}
$db->sql_freeresult($result);
+ // Total number of group members (non-leaders)
+ $sql = 'SELECT COUNT(user_id) AS total_members
+ FROM ' . USER_GROUP_TABLE . "
+ WHERE group_id = $group_id
+ AND group_leader = 0";
+ $result = $db->sql_query($sql);
+ $total_members = (int) $db->sql_fetchfield('total_members');
+ $db->sql_freeresult($result);
+
$s_action_options = '';
$options = array('default' => 'DEFAULT', 'approve' => 'APPROVE', 'demote' => 'DEMOTE', 'promote' => 'PROMOTE', 'deleteusers' => 'DELETE');
@@ -664,22 +646,18 @@ class acp_groups
'U_DEFAULT_ALL' => "{$this->u_action}&amp;action=default&amp;g=$group_id")
);
- foreach ($group_data['leader'] as $row)
- {
- $template->assign_block_vars('leader', array(
- 'U_USER_EDIT' => append_sid("{$phpbb_admin_path}index.$phpEx", "i=users&amp;action=edit&amp;u={$row['user_id']}"),
-
- 'USERNAME' => $row['username'],
- 'S_GROUP_DEFAULT' => ($row['group_id'] == $group_id) ? true : false,
- 'JOINED' => ($row['user_regdate']) ? $user->format_date($row['user_regdate']) : ' - ',
- 'USER_POSTS' => $row['user_posts'],
- 'USER_ID' => $row['user_id'])
- );
- }
+ // Grab the members
+ $sql = 'SELECT u.user_id, u.username, u.username_clean, u.user_regdate, u.user_posts, u.group_id, ug.group_leader, ug.user_pending
+ FROM ' . USERS_TABLE . ' u, ' . USER_GROUP_TABLE . " ug
+ WHERE ug.group_id = $group_id
+ AND u.user_id = ug.user_id
+ AND ug.group_leader = 0
+ ORDER BY ug.group_leader DESC, ug.user_pending ASC, u.username_clean";
+ $result = $db->sql_query_limit($sql, $config['topics_per_page'], $start);
$pending = false;
- foreach ($group_data['member'] as $row)
+ while ($row = $db->sql_fetchrow($result))
{
if ($row['user_pending'] && !$pending)
{
@@ -700,6 +678,7 @@ class acp_groups
'USER_ID' => $row['user_id'])
);
}
+ $db->sql_freeresult($result);
return;
break;
generated by cgit v1.2.1 (git 2.21.0) at 2026-05-19 11:37:43 +0000