From 98fca7dea4c92dfdd5344e0ce0167e71c904b17c Mon Sep 17 00:00:00 2001 From: David M Date: Sat, 14 Jan 2006 17:17:38 +0000 Subject: [PATCH] - Manage Groups now works! Hooray! git-svn-id: file:///svn/phpbb/trunk@5456 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/ucp/ucp_groups.php | 513 +++++++++++++++++- phpBB/language/en/groups.php | 2 + .../subSilver/template/ucp_groups_manage.html | 323 ++++++++--- 3 files changed, 763 insertions(+), 75 deletions(-) diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php index fce4dafe8a..96d9fca2e6 100644 --- a/phpBB/includes/ucp/ucp_groups.php +++ b/phpBB/includes/ucp/ucp_groups.php @@ -22,6 +22,7 @@ class ucp_groups $return_page = '

' . sprintf($user->lang['RETURN_PAGE'], '", ''); + $mark_ary = request_var('mark', array(0)); $submit = (!empty($_POST['submit'])) ? true : false; $delete = (!empty($_POST['delete'])) ? true : false; $error = $data = array(); @@ -365,7 +366,517 @@ class ucp_groups break; case 'manage': - break; + + $action = (isset($_POST['addusers'])) ? 'addusers' : request_var('action', ''); + $group_id = request_var('g', 0); + + if ($group_id) + { + $sql = 'SELECT * + FROM ' . GROUPS_TABLE . " + WHERE group_id = $group_id"; + $result = $db->sql_query($sql); + $group_row = $db->sql_fetchrow($result); + $db->sql_freeresult($result); + + if (!$group_row) + { + trigger_error($user->lang['NO_GROUP'] . $return_page); + } + } + + switch ($action) + { + case 'edit': + + if (!$group_id) + { + trigger_error($user->lang['NO_GROUP'] . $return_page); + } + + if (!($row = group_memberships($group_id, $user->data['user_id'])) || !$row[0]['group_leader']) + { + trigger_error($user->lang['NOT_MEMBER_OF_GROUP'] . $return_page); + } + + $file_uploads = (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on') ? true : false; + $user->add_lang(array('acp/groups', 'acp/common')); + + $data = $submit_ary = array(); + + $update = (isset($_POST['update'])) ? true : false; + + $error = array(); + + $avatar_select = basename(request_var('avatar_select', '')); + $category = basename(request_var('category', '')); + + $can_upload = (file_exists($phpbb_root_path . $config['avatar_path']) && is_writeable($phpbb_root_path . $config['avatar_path']) && $file_uploads) ? true : false; + + // Did we submit? + if ($update) + { + $group_name = request_var('group_name', ''); + $group_description = request_var('group_description', ''); + $group_type = request_var('group_type', GROUP_FREE); + + $data['uploadurl'] = request_var('uploadurl', ''); + $data['remotelink'] = request_var('remotelink', ''); + $delete = request_var('delete', ''); + + $submit_ary = array( + 'colour' => request_var('group_colour', ''), + 'rank' => request_var('group_rank', 0), + 'receive_pm' => isset($_REQUEST['group_receive_pm']) ? 1 : 0, + 'message_limit' => request_var('group_message_limit', 0) + ); + + if (!empty($_FILES['uploadfile']['tmp_name']) || $data['uploadurl'] || $data['remotelink']) + { + $data['width'] = request_var('width', ''); + $data['height'] = request_var('height', ''); + + // Avatar stuff + $var_ary = array( + 'uploadurl' => array('string', true, 5, 255), + 'remotelink' => array('string', true, 5, 255), + 'width' => array('string', true, 1, 3), + 'height' => array('string', true, 1, 3), + ); + + if (!($error = validate_data($data, $var_ary))) + { + $data['user_id'] = "g$group_id"; + + if ((!empty($_FILES['uploadfile']['tmp_name']) || $data['uploadurl']) && $can_upload) + { + list($submit_ary['avatar_type'], $submit_ary['avatar'], $submit_ary['avatar_width'], $submit_ary['avatar_height']) = avatar_upload($data, $error); + } + else if ($data['remotelink']) + { + list($submit_ary['avatar_type'], $submit_ary['avatar'], $submit_ary['avatar_width'], $submit_ary['avatar_height']) = avatar_remote($data, $error); + } + } + } + else if ($avatar_select && $config['allow_avatar_local']) + { + // check avatar gallery + if (is_dir($phpbb_root_path . $config['avatar_gallery_path'] . '/' . $category)) + { + $submit_ary['avatar_type'] = AVATAR_GALLERY; + + list($submit_ary['avatar_width'], $submit_ary['avatar_height']) = getimagesize($phpbb_root_path . $config['avatar_gallery_path'] . '/' . $category . '/' . $avatar_select); + $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; + } + + if ((isset($submit_ary['avatar']) && $submit_ary['avatar'] && (!isset($group_row['group_avatar']) || $group_row['group_avatar'] != $submit_ary['avatar'])) || $delete) + { + if (isset($group_row['group_avatar']) && $group_row['group_avatar']) + { + avatar_delete($group_row['group_avatar']); + } + } + + // Only set the rank, colour, etc. if it's changed or if we're adding a new + // group. This prevents existing group members being updated if no changes + // were made. + + $group_attributes = array(); + $test_variables = array('rank', 'colour', 'avatar', 'avatar_type', 'avatar_width', 'avatar_height'); + foreach ($test_variables as $test) + { + if ($action == 'add' || (isset($submit_ary[$test]) && $group_row['group_' . $test] != $submit_ary[$test])) + { + $group_attributes['group_' . $test] = $group_row['group_' . $test] = $submit_ary[$test]; + } + } + + if (!($error = group_create($group_id, $group_type, $group_name, $group_description, $group_attributes))) + { + $message = ($action == 'edit') ? 'GROUP_UPDATED' : 'GROUP_CREATED'; + trigger_error($user->lang[$message] . $return_page); + } + } + else if (!$group_id) + { + $group_name = request_var('group_name', ''); + $group_description = ''; + $group_rank = 0; + $group_type = GROUP_OPEN; + } + else + { + $group_name = $group_row['group_name']; + $group_description = $group_row['group_description']; + $group_type = $group_row['group_type']; + $group_rank = $group_row['group_rank']; + } + + $sql = 'SELECT * + FROM ' . RANKS_TABLE . ' + WHERE rank_special = 1 + ORDER BY rank_title'; + $result = $db->sql_query($sql); + + $rank_options = ''; + while ($row = $db->sql_fetchrow($result)) + { + $selected = ($group_rank && $row['rank_id'] == $group_rank) ? ' selected="selected"' : ''; + $rank_options .= ''; + } + $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"' : ''; + + if (isset($group_row['group_avatar']) && $group_row['group_avatar']) + { + switch ($group_row['group_avatar_type']) + { + case AVATAR_UPLOAD: + $avatar_img = $phpbb_root_path . $config['avatar_path'] . '/'; + break; + case AVATAR_GALLERY: + $avatar_img = $phpbb_root_path . $config['avatar_gallery_path'] . '/'; + break; + } + $avatar_img .= $group_row['group_avatar']; + + $avatar_img = ''; + } + else + { + $avatar_img = ''; + } + + $display_gallery = (isset($_POST['display_gallery'])) ? true : false; + + if ($config['allow_avatar_local'] && $display_gallery) + { + avatar_gallery($category, $avatar_select, 4); + } + + $template->assign_vars(array( + 'S_EDIT' => true, + 'S_INCLUDE_SWATCH' => true, + 'S_CAN_UPLOAD' => $can_upload, + 'S_ERROR' => (sizeof($error)) ? true : false, + 'S_SPECIAL_GROUP' => ($group_type == GROUP_SPECIAL) ? true : false, + 'S_DISPLAY_GALLERY' => ($config['allow_avatar_local'] && !$display_gallery) ? true : false, + 'S_IN_GALLERY' => ($config['allow_avatar_local'] && $display_gallery) ? true : false, + + 'ERROR_MSG' => (sizeof($error)) ? implode('
', $error) : '', + 'GROUP_NAME' => ($group_type == GROUP_SPECIAL) ? $user->lang['G_' . $group_name] : $group_name, + 'GROUP_INTERNAL_NAME' => $group_name, + 'GROUP_DESCRIPTION' => $group_description, + 'GROUP_RECEIVE_PM' => (isset($group_row['group_receive_pm']) && $group_row['group_receive_pm']) ? ' checked="checked"' : '', + 'GROUP_MESSAGE_LIMIT' => (isset($group_row['group_message_limit'])) ? $group_row['group_message_limit'] : 0, + 'GROUP_COLOUR' => (isset($group_row['group_colour'])) ? $group_row['group_colour'] : '', + + 'S_RANK_OPTIONS' => $rank_options, + 'AVATAR_IMAGE' => $avatar_img, + 'AVATAR_MAX_FILESIZE' => $config['avatar_filesize'], + 'GROUP_AVATAR_WIDTH' => (isset($group_row['group_avatar_width'])) ? $group_row['group_avatar_width'] : '', + 'GROUP_AVATAR_HEIGHT' => (isset($group_row['group_avatar_height'])) ? $group_row['group_avatar_height'] : '', + + 'GROUP_TYPE_FREE' => GROUP_FREE, + 'GROUP_TYPE_OPEN' => GROUP_OPEN, + 'GROUP_TYPE_CLOSED' => GROUP_CLOSED, + 'GROUP_TYPE_HIDDEN' => GROUP_HIDDEN, + 'GROUP_TYPE_SPECIAL' => GROUP_SPECIAL, + + 'GROUP_FREE' => $type_free, + 'GROUP_OPEN' => $type_open, + 'GROUP_CLOSED' => $type_closed, + 'GROUP_HIDDEN' => $type_hidden, + + 'U_SWATCH' => "{$phpbb_root_path}adm/swatch.$phpEx$SID&form=settings&name=group_colour", + 'U_ACTION' => "ucp.$phpEx$SID&i=$id&mode=$mode&action=$action&g=$group_id", + 'L_AVATAR_EXPLAIN' => sprintf($user->lang['AVATAR_EXPLAIN'], $config['avatar_max_width'], $config['avatar_max_height'], round($config['avatar_filesize'] / 1024))) + ); + + break; + + case 'list': + + if (!$group_id) + { + trigger_error($user->lang['NO_GROUP'] . $return_page); + } + + if (!($row = group_memberships($group_id, $user->data['user_id'])) || !$row[0]['group_leader']) + { + trigger_error($user->lang['NOT_MEMBER_OF_GROUP'] . $return_page); + } + + $user->add_lang(array('acp/groups', 'acp/common')); + + // 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', 0, $result); + $db->sql_freeresult($result); + + $start = request_var('start', 0); + + // Grab the members + $sql = 'SELECT u.user_id, u.username, 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"; + $result = $db->sql_query_limit($sql, $config['topics_per_page'], $start); + + $pending = false; + + while ($row = $db->sql_fetchrow($result)) + { + if ($row['user_pending'] && !$pending) + { + $template->assign_block_vars('member', array( + 'S_PENDING' => true) + ); + + $pending = true; + } + + $template->assign_block_vars('member', array( + 'USERNAME' => $row['username'], + 'U_USER_VIEW' => "memberlist.$phpEx$SID&mode=viewprofile&u={$row['user_id']}", + 'S_GROUP_DEFAULT' => ($row['group_id'] == $group_id) ? true : false, + 'JOINED' => ($row['user_regdate']) ? $user->format_date($row['user_regdate'], $user->lang['DATE_FORMAT']) : '-', + 'USER_POSTS' => $row['user_posts'], + 'USER_ID' => $row['user_id']) + ); + } + $db->sql_freeresult($result); + + $s_action_options = ''; + $options = array('default' => 'DEFAULT', 'approve' => 'APPROVE', 'deleteusers' => 'DELETE'); + + foreach ($options as $option => $lang) + { + $s_action_options .= ''; + } + + $template->assign_vars(array( + 'S_LIST' => true, + 'S_ACTION_OPTIONS' => $s_action_options, + 'S_ON_PAGE' => on_page($total_members, $config['topics_per_page'], $start), + 'PAGINATION' => generate_pagination("ucp.$phpEx$SID&i=$id&mode=$mode&action=$action&g=$group_id", $total_members, $config['topics_per_page'], $start, true), + + 'U_ACTION' => "ucp.$phpEx$SID&i=$id&mode=$mode&g=$group_id", + 'U_FIND_USERNAME' => "memberlist.$phpEx$SID&mode=searchuser&form=list&field=usernames") + ); + + break; + + case 'approve': + + if (!$group_id) + { + trigger_error($user->lang['NO_GROUP'] . $return_page); + } + + if (!($row = group_memberships($group_id, $user->data['user_id'])) || !$row[0]['group_leader']) + { + trigger_error($user->lang['NOT_MEMBER_OF_GROUP'] . $return_page); + } + + $user->add_lang('acp/groups'); + + // Approve, demote or promote + group_user_attributes('approve', $group_id, $mark_ary, false, ($group_id) ? $group_row['group_name'] : false); + + trigger_error($user->lang['USERS_APPROVED'] . $return_page); + break; + + case 'default': + + if (!$group_id) + { + trigger_error($user->lang['NO_GROUP'] . $return_page); + } + + if (!($row = group_memberships($group_id, $user->data['user_id'])) || !$row[0]['group_leader']) + { + trigger_error($user->lang['NOT_MEMBER_OF_GROUP'] . $return_page); + } + + if (confirm_box(true)) + { + if (!sizeof($mark_ary)) + { + $start = 0; + + do + { + $sql = 'SELECT user_id + FROM ' . USER_GROUP_TABLE . " + WHERE group_id = $group_id + ORDER BY user_id"; + $result = $db->sql_query_limit($sql, 200, $start); + + $mark_ary = array(); + if ($row = $db->sql_fetchrow($result)) + { + do + { + $mark_ary[] = $row['user_id']; + } + while ($row = $db->sql_fetchrow($result)); + + group_user_attributes('default', $group_id, $mark_ary, false, $group_row['group_name'], $group_row); + + $start = (sizeof($mark_ary) < 200) ? 0 : $start + 200; + } + else + { + $start = 0; + } + $db->sql_freeresult($result); + } + while ($start); + } + else + { + group_user_attributes('default', $group_id, $mark_ary, false, $group_row['group_name'], $group_row); + } + + $user->add_lang('acp/groups'); + + trigger_error($user->lang['GROUP_DEFS_UPDATED'] . $return_page); + } + else + { + + $user->add_lang('acp/common'); + + confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array( + 'mark' => $mark_ary, + 'g' => $group_id, + 'i' => $id, + 'mode' => $mode, + 'action' => $action)) + ); + } + + break; + + case 'deleteusers': + + $user->add_lang(array('acp/groups', 'acp/common')); + + if (!($row = group_memberships($group_id, $user->data['user_id'])) || !$row[0]['group_leader']) + { + trigger_error($user->lang['NOT_MEMBER_OF_GROUP'] . $return_page); + } + + if (confirm_box(true)) + { + if (!$group_id) + { + trigger_error($user->lang['NO_GROUP'] . $return_page); + } + + $error = group_user_del($group_id, $mark_ary, false, $group_row['group_name']); + + if ($error) + { + trigger_error($user->lang[$error] . $return_page); + } + + trigger_error($user->lang['GROUP_USERS_REMOVE'] . $return_page); + } + else + { + confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array( + 'mark' => $mark_ary, + 'g' => $group_id, + 'i' => $id, + 'mode' => $mode, + 'action' => $action)) + ); + } + break; + + case 'addusers': + + $user->add_lang(array('acp/groups', 'acp/common')); + + $name_ary = request_var('usernames', ''); + + if (!$group_id) + { + trigger_error($user->lang['NO_GROUP'] . $return_page); + } + + if (!$name_ary) + { + trigger_error($user->lang['NO_USERS'] . $return_page); + } + + if (!($row = group_memberships($group_id, $user->data['user_id'])) || !$row[0]['group_leader']) + { + trigger_error($user->lang['NOT_MEMBER_OF_GROUP'] . $return_page); + } + + $name_ary = array_unique(explode("\n", $name_ary)); + + $default = request_var('default', 0); + + // Add user/s to group + if ($error = group_user_add($group_id, false, $name_ary, $group_row['group_name'], $default, 0, 0, $group_row)) + { + trigger_error($user->lang[$error] . $return_page); + } + + trigger_error($user->lang['GROUP_USERS_ADDED'] . $return_page); + break; + + default: + $user->add_lang('acp/common'); + + $sql = 'SELECT g.group_id, g.group_name, g.group_description, g.group_type, ug.group_leader + FROM ' . GROUPS_TABLE . ' g, ' . USER_GROUP_TABLE . ' ug + WHERE ug.user_id = ' . $user->data['user_id'] . ' + AND g.group_id = ug.group_id + AND ug.group_leader = 1 + ORDER BY g.group_type DESC, g.group_name'; + $result = $db->sql_query($sql); + + while ($value = $db->sql_fetchrow($result)) + { + $template->assign_block_vars('leader', array( + 'GROUP_NAME' => ($value['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $value['group_name']] : $value['group_name'], + 'GROUP_DESC' => $value['group_description'], + 'GROUP_TYPE' => $value['group_type'], + 'GROUP_ID' => $value['group_id'], + + 'U_LIST' => "{$phpbb_root_path}ucp.$phpEx$SID&i=$id&mode=$mode&action=list&g={$value['group_id']}", + 'U_EDIT' => "{$phpbb_root_path}ucp.$phpEx$SID&i=$id&mode=$mode&action=edit&g={$value['group_id']}") + ); + } + + $db->sql_freeresult($result); + + break; + } + + break; } $this->tpl_name = 'ucp_groups_' . $mode; diff --git a/phpBB/language/en/groups.php b/phpBB/language/en/groups.php index bad757fa11..fb4fac6d54 100644 --- a/phpBB/language/en/groups.php +++ b/phpBB/language/en/groups.php @@ -63,6 +63,8 @@ $lang = array_merge($lang, array( 'GROUP_IS_FREE' => 'This is a freely open group, all new members are welcome.', 'GROUP_IS_SPECIAL' => 'This is a special group, special groups are managed by the board administrators.', + 'GROUP_LIST' => 'Manage Users', + 'LOGIN_EXPLAIN_GROUP' => 'You need to login to view group details', 'NOT_LEADER_OF_GROUP' => 'The requested operation cannot be taken because you are not a leader of the selected group.', diff --git a/phpBB/styles/subSilver/template/ucp_groups_manage.html b/phpBB/styles/subSilver/template/ucp_groups_manage.html index a8ce652c1a..4cd2918da9 100644 --- a/phpBB/styles/subSilver/template/ucp_groups_manage.html +++ b/phpBB/styles/subSilver/template/ucp_groups_manage.html @@ -1,86 +1,261 @@ + + + +
+

{L_WARNING}

+

{ERROR_MSG}

+
+ +
enctype="multipart/form-data"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{L_USERGROUPS}
{L_GROUPS_EXPLAIN}
{L_GROUP_DETAILS}
for="group_name">{L_GROUP_NAME}:{GROUP_NAME}

{L_GROUP_TYPE_EXPLAIN} + 		+ {L_GROUP_OPEN}   + {L_GROUP_REQUEST}   + {L_GROUP_CLOSED}   + {L_GROUP_HIDDEN} +
{L_GROUP_SETTINGS_SAVE}

{L_GROUP_COLOR_EXPLAIN}		  [ {L_COLOUR_SWATCH} ]
{L_GROUP_AVATAR}

{L_AVATAR_EXPLAIN}		{AVATAR_IMAGE}

 {L_DELETE_AVATAR}

{L_UPLOAD_AVATAR_URL_EXPLAIN}

{L_LINK_REMOTE_AVATAR_EXPLAIN}

{L_LINK_REMOTE_SIZE_EXPLAIN}		 px X px
{L_AVATAR_GALLERY}
 
+ + + + + + + + + + + + + +
{avatar_row.avatar_column.AVATAR_NAME}
+
  +
+
+ + + + + +

{L_GROUP_MEMBERS}

+ +

{L_GROUP_MEMBERS_EXPLAIN}

+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{L_USERNAME}{L_GROUP_DEFAULT}{L_JOINED}{L_POSTS}{L_MARK}
{L_GROUP_APPROVED}
{L_GROUP_PENDING}
{member.USERNAME}{L_YES}{L_NO}{member.JOINED}{member.USER_POSTS}
{L_GROUPS_NO_MEMBERS}
+ + +
+
+ +

{L_ADD_USERS}

+ +

{L_ADD_USERS_EXPLAIN}

+ + + + + + + + + + + + + + + +
{L_ADD_USERS}

{L_USER_GROUP_DEFAULT_EXPLAIN}		 {L_YES}   {L_NO}

{L_USERNAMES_EXPLAIN}
[ {L_FIND_USERNAME} ]
+
+ +
+ + - - - - - - + + + + + + - - - - - - - - - - + + + + + + + - - - - - - - - + + + - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + +
{L_USERGROUPS}
{L_GROUPS_EXPLAIN}
{L_USERGROUPS}
{L_GROUPS_EXPLAIN}
{L_GROUP_DETAILS} - {L_MARK} -
{L_SELECT}:  
{L_GROUP_LEADER}
{L_GROUP_DETAILS} + {L_OPTIONS} +
{L_GROUP_LEADER}
{leader.GROUP_NAME}

{leader.GROUP_DESC}

{L_NO_LEADERS}
{leader.GROUP_NAME}

{leader.GROUP_DESC}

{L_EDIT}{L_GROUP_LIST}
{L_GROUP_MEMBER_DEFAULT}
{L_NO_LEADERS}
{member.GROUP_NAME}

{member.GROUP_DESC}

{L_NO_MEMBERS}
{L_GROUP_MEMBER_NOT_DEFAULT}
{pending.GROUP_NAME}

{pending.GROUP_DESC}

{L_NO_PENDING}
{L_GROUP_PENDING}
{nonmember.GROUP_NAME}

{nonmember.GROUP_DESC}

{L_NO_PENDING}
 
- + \ No newline at end of file