From d96bb3a86e4a78ec4f1753f87d9dd0411f8da896 Mon Sep 17 00:00:00 2001 From: "Paul S. Owen" Date: Mon, 25 Aug 2003 01:38:49 +0000 Subject: A few more changes ... nearly there ... deleting users is going to be a little troublesome git-svn-id: file:///svn/phpbb/trunk@4430 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/admin_groups.php | 416 +++++++++++++++++++++++++++------------------ 1 file changed, 246 insertions(+), 170 deletions(-) (limited to 'phpBB/adm/admin_groups.php') diff --git a/phpBB/adm/admin_groups.php b/phpBB/adm/admin_groups.php index 4bae471635..ea8016d434 100644 --- a/phpBB/adm/admin_groups.php +++ b/phpBB/adm/admin_groups.php @@ -1,23 +1,16 @@ lang['NO_GROUP']); + } + break; + + case 'approve': + if (!$group_id) + { + trigger_error($user->lang['NO_GROUP']); + } + + if (!empty($_POST['mark'])) + { + $id_ary = array_map('intval', $_POST['mark']); + + $sql = 'UPDATE ' . USER_GROUP_TABLE . ' + SET user_pending = 1 + WHERE user_id IN (' . implode(', ', $id_ary) . ") + AND group_id = $group_id"; + $db->sql_query($sql); + + $sql = 'SELECT username + FROM ' . USERS_TABLE . ' + WHERE user_id IN (' . implode(', ', $id_ary) . ')'; + $result = $db->sql_query($sql); + + $usernames = array(); + while ($row = $db->sql_fetchrow($result)) + { + $usernames[] = $row['username']; + } + $db->sql_freeresult($result); + + add_log('admin', 'LOG_GROUP_APPROVE', $group_name, implode(', ', $usernames)); + unset($usernames); + + trigger_error($user->lang['USERS_APPROVED']); + } + break; + + case 'default': + if (!$group_id) + { + trigger_error($user->lang['NO_GROUP']); + } + + $id_ary = (!empty($_POST['mark'])) ? array_map('intval', $_POST['mark']) : false; + + switch (SQL_LAYER) + { + case 'mysql': + case 'mysql4': + $start = 0; + do + { + $sql = 'SELECT user_id + FROM ' . USER_GROUP_TABLE . " + WHERE group_id = $group_id + ORDER BY user_id + LIMIT $start, 200"; + $result = $db->sql_query($sql); + + $user_id_ary = array(); + if ($row = $db->sql_fetchrow($result)) + { + do + { + $user_id_ary[] = $row['user_id']; + } + while ($row = $db->sql_fetchrow($result)); + + $sql = 'UPDATE ' . USERS_TABLE . " + SET group_id = $group_id, user_colour = '$group_colour', user_rank = $group_rank + WHERE user_id IN (" . implode(', ', $user_id_ary) . ')'; + $db->sql_query($sql); + + $start = (sizeof($user_id_ary) < 200) ? 0 : $start + 200; + } + else + { + $start = 0; + } + $db->sql_freeresult($result); + } + while ($start); + break; + + default: + $sql = 'UPDATE ' . USERS_TABLE . " + SET group_id = $group_id, user_colour = '$group_color', user_rank = $group_rank + WHERE user_id IN ( + SELECT user_id + FROM " . USER_GROUP_TABLE . " + WHERE group_id = $group_id + )"; + $db->sql_query($sql); + break; + } + + add_log('admin', 'LOG_GROUP_DEFAULTS', $group_name); + + trigger_error($user->lang['GROUP_DEFS_UPDATED']); + break; + case 'edit': case 'addgroup': + if ($action == 'edit' && !$group_id) + { + trigger_error($user->lang['NO_GROUP']); + } // Did we submit? if ($update) { if ($group_type != GROUP_SPECIAL) { - $group_name = (!empty($_POST['group_name'])) ? htmlspecialchars($_POST['group_name']) : ''; + $group_name = (!empty($_POST['group_name'])) ? stripslashes(htmlspecialchars($_POST['group_name'])) : ''; $group_type = (!empty($_POST['group_type'])) ? intval($_POST['group_type']) : ''; } - $group_description = (!empty($_POST['group_description'])) ? htmlspecialchars($_POST['group_description']) : ''; - $group_colour = (!empty($_POST['group_colour'])) ? htmlspecialchars($_POST['group_colour']) : ''; - $group_rank = (isset($_POST['group_rank'])) ? intval($_POST['group_rank']) : ''; - $group_avatar = (!empty($_POST['group_avatar'])) ? htmlspecialchars($_POST['group_avatar']) : ''; + $group_description = (!empty($_POST['group_description'])) ? stripslashes(htmlspecialchars($_POST['group_description'])) : ''; + $group_colour2 = (!empty($_POST['group_colour'])) ? stripslashes(htmlspecialchars($_POST['group_colour'])) : ''; + $group_avatar2 = (!empty($_POST['group_avatar'])) ? stripslashes(htmlspecialchars($_POST['group_avatar'])) : ''; + $group_rank2 = (isset($_POST['group_rank'])) ? intval($_POST['group_rank']) : ''; // Check data - if ($group_name == '' || strlen($group_name) > 40) + if (!strlen($group_name) || strlen($group_name) > 40) { - $error .= (($error != '') ? '
' : '') . (($group_name == '') ? $user->lang['GROUP_ERR_USERNAME'] : $user->lang['GROUP_ERR_USER_LONG']); + $error[] = (!strlen($group_name)) ? $user->lang['GROUP_ERR_USERNAME'] : $user->lang['GROUP_ERR_USER_LONG']; } + if (strlen($group_description) > 255) { - $error .= (($error != '') ? '
' : '') . $user->lang['GROUP_ERR_DESC_LONG']; + $error[] = $user->lang['GROUP_ERR_DESC_LONG']; } + if ($group_type < GROUP_OPEN || $group_type > GROUP_FREE) { - $error .= (($error != '') ? '
' : '') . $user->lang['GROUP_ERR_TYPE']; + $error[] = $user->lang['GROUP_ERR_TYPE']; } - /* + // Update DB - if (!$error) + if (!sizeof($error)) { // Update group preferences - $sql = "UPDATE " . GROUPS_TABLE . " - SET group_name = '$group_name', group_description = '$group_description', group_type = $group_type, group_rank = $group_rank, group_colour = '$group_colour' - WHERE group_id = $group_id"; + $sql_ary = array( + 'group_name' => (string) $group_name, + 'group_description' => (string) $group_description, + 'group_type' => (int) $group_type, + 'group_rank' => (int) $group_rank2, + 'group_colour' => (string) $group_colour2, + ); + + $sql = ($action == 'edit') ? 'UPDATE ' . GROUPS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . " WHERE group_id = $group_id" : 'INSERT INTO ' . GROUPS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary); $db->sql_query($sql); - $user_sql = ''; - $user_sql .= (isset($_POST['submit'])) ? ((($user_sql != '') ? ', ' : '') . "user_colour = '$group_colour'") : ''; - $user_sql .= (isset($_POST['submit']) && $group_rank != -1) ? ((($user_sql != '') ? ', ' : '') . "user_rank = $group_rank") : ''; - - // Update group members preferences - switch (SQL_LAYER) + if ($group_id && ($group_colour != $group_colour2 || $group_rank != $group_rank2 || $group_avatar != $group_avatar2)) { - case 'mysql': - case 'mysql4': - // batchwise? 500 at a time or so maybe? try to reduce memory useage - $more = true; - $start = 0; - do - { - $sql = 'SELECT user_id - FROM ' . USER_GROUP_TABLE . " - WHERE group_id = $group_id - LIMIT $start, 500"; - $result = $db->sql_query($sql); - - if ($row = $db->sql_fetchrow($result)) - { - $user_count = 0; - $user_id_sql = ''; - do - { - $user_id_sql .= (($user_id_sql != '') ? ', ' : '') . $row['user_id']; - $user_count++; - } - while ($row = $db->sql_fetchrow($result)); - - $sql = 'UPDATE ' . USERS_TABLE . " - SET $user_sql - WHERE user_id IN ($user_id_sql)"; - $db->sql_query($sql); - - if ($user_count == 500) - { - $start += 500; - } - else - { - $more = false; - } - } - else - { - $more = false; - } - $db->sql_freeresult($result); - unset($user_id_sql); - } - while ($more); + $sql_ary = array( + 'user_rank' => (string) $group_rank2, + 'user_colour' => (string) $group_colour2, + ); - break; - - default: - $sql ='"UPDATE ' . USERS_TABLE . " - SET $user_sql - WHERE user_id IN ( - SELECT user_id - FROM " . USER_GROUP_TABLE . " - WHERE group_id = $group_id)"; - $db->sql_query($sql); + $sql = 'UPDATE ' . USERS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . " + WHERE group_id = $group_id"; + $db->sql_query($sql); } - trigger_error($user->lang['GROUP_UPDATED']); - }*/ - } + $log = ($action == 'edit') ? 'LOG_GROUP_UPDATED' : 'LOG_GROUP_CREATED'; + add_log('admin', $log, $group_name); + $message = ($action == 'edit') ? 'GROUP_UPDATED' : 'GROUP_CREATED'; + trigger_error($message); + } + + $group_colour = &$group_colour2; + $group_rank = &$group_rank2; + $group_avatar = &$group_avatar2; + } + else if (!$group_id) + { + $group_name = (!empty($_POST['group_name'])) ? stripslashes(htmlspecialchars($_POST['group_name'])) : ''; + $group_description = $group_colour = $group_avatar = ''; + $group_type = GROUP_FREE; + } ?> @@ -237,10 +302,10 @@ switch ($mode) } $db->sql_freeresult($result); + $type_free = ($group_type == GROUP_FREE) ? ' checked="checked"' : ''; $type_open = ($group_type == GROUP_OPEN) ? ' checked="checked"' : ''; $type_closed = ($group_type == GROUP_CLOSED) ? ' checked="checked"' : ''; $type_hidden = ($group_type == GROUP_HIDDEN) ? ' checked="checked"' : ''; - $type_free = ($group_type == GROUP_FREE) ? ' checked="checked"' : ''; ?> @@ -256,7 +321,7 @@ function swatch() //--> -
"> +">
@@ -287,7 +352,7 @@ function swatch() else { -?>lang['G_' . $group_name])) ? $user->lang['G_' . $group_name] : $group_name; ?>lang['G_' . $group_name] : $group_name; ?>lang['GROUP_SETTINGS_SAVE']; ?> - - + + @@ -328,7 +393,7 @@ function swatch() - +
lang['GROUP_DETAILS']; ?>
lang['GROUP_COLOR']; ?>:
lang['GROUP_COLOR_EXPLAIN'], '', ''); ?>		lang['GROUP_COLOR']; ?>:
lang['GROUP_COLOR_EXPLAIN']; ?>		   [ " onclick="swatch();return false" target="_swatch">lang['COLOUR_SWATCH']; ?> ]
lang['GROUP_RANK']; ?>: 
   
lang['NO_GROUP']); + } $username_ary = (!empty($_POST['usernames'])) ? array_unique(explode("\n", $_POST['usernames'])) : ''; if (!$username_ary) @@ -358,7 +425,7 @@ function swatch() unset($username_ary); // Grab the user ids - $sql = 'SELECT user_id + $sql = 'SELECT user_id, username FROM ' . USERS_TABLE . ' WHERE username IN (' . implode(', ', $sql_where) . ')'; $result = $db->sql_query($sql); @@ -368,9 +435,10 @@ function swatch() trigger_error($user->lang['NO_USERS']); } - $id_ary = array(); + $id_ary = $username_ary = array(); do { + $username_ary[$row['user_id']] = $row['username']; $id_ary[] = $row['user_id']; } while ($row = $db->sql_fetchrow($result)); @@ -446,6 +514,7 @@ function swatch() $db->sql_query($sql); } + $usernames = array(); if (sizeof($update_id_ary)) { $sql = 'UPDATE ' . USER_GROUP_TABLE . ' @@ -453,32 +522,49 @@ function swatch() WHERE user_id IN (' . implode(', ', $update_id_ary) . ") AND group_id = $group_id"; $db->sql_query($sql); - } + foreach ($update_id_ary as $id) + { + $usernames[] = $username_ary[$id]; + } + } + else + { + foreach ($add_id_ary as $id) + { + $usernames[] = $username_ary[$id]; + } + } + unset($username_ary); // Update user settings (color, rank) if applicable + // TODO + // Do not update users who are not approved if (!empty($_POST['default'])) { $sql = 'UPDATE ' . USERS_TABLE . " SET group_id = $group_id, user_colour = '$group_colour', user_rank = " . intval($group_rank) . " - WHERE user_id IN (" . implode(', ', $add_id_ary) . ")"; + WHERE user_id IN (" . implode(', ', array_merge($add_id_ary, $update_id_ary)) . ")"; $db->sql_query($sql); } + unset($update_id_ary); + unset($add_id_ary); -// add_log(); + $log = ($mode == 'addleaders') ? 'LOG_MODS_ADDED' : 'LOG_USERS_ADDED'; + add_log('admin', $log, $group_name, implode(', ', $usernames)); $message = ($mode == 'addleaders') ? 'GROUP_MODS_ADDED' : 'GROUP_USERS_ADDED'; trigger_error($user->lang[$message]); - - - - break; - + break; // Show list of leaders, existing and pending members case 'list': + if (!$group_id) + { + trigger_error($user->lang['NO_GROUP']); + } ?> @@ -565,11 +651,11 @@ function swatch() ?> - " target="_profile"> + "> lang['YES'] : $user->lang['NO']; ?> format_date($row['user_regdate'], $user->lang['DATE_FORMAT']); ?> - + - - - - - -
+ Select option:       @@ -607,7 +688,7 @@ function swatch()
- + @@ -681,11 +762,11 @@ function swatch() ?> - " target="_profile"> + "> lang['YES'] : $user->lang['NO']; ?> format_date($row['user_regdate'], $user->lang['DATE_FORMAT']); ?> - + - - - - - -
 
+ Select option:       @@ -722,22 +798,22 @@ function swatch()
- + @@ -767,24 +843,36 @@ function swatch() sql_query($sql); - $special_toggle = false; + $special = $normal = 0; + $group_ary = array(); while ($row = $db->sql_fetchrow($result) ) { - $row_class = ($row_class != 'row1') ? 'row1' : 'row2'; + $type = ($row['group_type'] == GROUP_SPECIAL) ? 'special' : 'normal'; - if ($row['group_type'] == GROUP_SPECIAL && !$special_toggle) + $group_ary[$type][$$type]['group_id'] = $row['group_id']; + $group_ary[$type][$$type]['group_name'] = $row['group_name']; + $group_ary[$type][$$type]['group_type'] = $row['group_type']; + $group_ary[$type][$$type]['total_members'] = $row['total_members']; + + $$type++; + } + $db->sql_freeresult($result); + + $special_toggle = false; + foreach ($group_ary as $type => $row_ary) + { + if ($type == 'special') { - $special_toggle = true; ?> - Create new group: + Create new group: @@ -802,8 +890,12 @@ function swatch() } - $group_id = $row['group_id']; - $group_name = (!empty($user->lang['G_' . $row['group_name']]))? $user->lang['G_' . $row['group_name']] : $row['group_name']; + foreach ($row_ary as $row) + { + $row_class = ($row_class != 'row1') ? 'row1' : 'row2'; + + $group_id = $row['group_id']; + $group_name = (!empty($user->lang['G_' . $row['group_name']]))? $user->lang['G_' . $row['group_name']] : $row['group_name']; ?> @@ -813,30 +905,14 @@ function swatch()  ">lang['EDIT']; ?>   " . $user->lang['DELETE'] . '' : $user->lang['DELETE']; - + echo ($row['group_type'] != GROUP_SPECIAL) ? "" . $user->lang['DELETE'] . '' : $user->lang['DELETE']; ?>  - - -   - -sql_freeresult($result); ?> -- cgit v1.2.1