Menu
▾
▴
[Phpbb-checkins] CVS: phpBB2/includes/ucp ucp_attachments.php,1.8,1.9 ucp_groups.php,1.2,1.3 ucp_pm_compose.php,1.12,1.13 ucp_pm_options.php,1.8,1.9 ucp_register.php,1.36,1.37
|
From: Meik S. <acy...@us...> - 2005-08-19 10:54:01
|
Update of /cvsroot/phpbb/phpBB2/includes/ucp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25083/includes/ucp Modified Files: ucp_attachments.php ucp_groups.php ucp_pm_compose.php ucp_pm_options.php ucp_register.php Log Message: ucp -> groups -> memberships Index: ucp_attachments.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/includes/ucp/ucp_attachments.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** ucp_attachments.php 9 Apr 2005 12:26:42 -0000 1.8 --- ucp_attachments.php 19 Aug 2005 10:53:52 -0000 1.9 *************** *** 27,34 **** if ($delete && sizeof($delete_ids)) { ! $s_hidden_fields = '<input type="hidden" name="delete" value="1" />'; foreach ($delete_ids as $attachment_id) { ! $s_hidden_fields .= '<input type="hidden" name="attachment[' . $attachment_id . ']" value="1" />'; } --- 27,35 ---- if ($delete && sizeof($delete_ids)) { ! $s_hidden_fields = array('delete' => 1); ! foreach ($delete_ids as $attachment_id) { ! $s_hidden_fields['attachment'][$attachment_id] = 1; } *************** *** 45,49 **** else { ! confirm_box(false, (sizeof($delete_ids) == 1) ? 'DELETE_ATTACHMENT' : 'DELETE_ATTACHMENTS', $s_hidden_fields); } } --- 46,50 ---- else { ! confirm_box(false, (sizeof($delete_ids) == 1) ? 'DELETE_ATTACHMENT' : 'DELETE_ATTACHMENTS', build_hidden_fields($s_hidden_fields)); } } Index: ucp_groups.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/includes/ucp/ucp_groups.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** ucp_groups.php 9 Apr 2005 12:26:42 -0000 1.2 --- ucp_groups.php 19 Aug 2005 10:53:52 -0000 1.3 *************** *** 21,24 **** --- 21,26 ---- $user->add_lang('groups'); + $return_page = '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $phpbb_root_path . "ucp.$phpEx$SID&i=$id&mode=$mode\">", '</a>'); + $submit = (!empty($_POST['submit'])) ? true : false; $delete = (!empty($_POST['delete'])) ? true : false; *************** *** 29,32 **** --- 31,251 ---- case 'membership': + if ($submit || isset($_POST['change_default'])) + { + $action = (isset($_POST['change_default'])) ? 'change_default' : request_var('action', ''); + $group_id = ($action == 'change_default') ? request_var('default', 0) : request_var('selected', 0); + + if (!$group_id) + { + trigger_error('NO_GROUP_SELECTED'); + } + + $sql = 'SELECT group_id, group_name, group_type + FROM ' . GROUPS_TABLE . " + WHERE group_id IN ($group_id, {$user->data['group_id']})"; + $result = $db->sql_query($sql); + $group_row = array(); + + while ($row = $db->sql_fetchrow($result)) + { + $group_row[$row['group_id']] = $row; + } + $db->sql_freeresult($result); + + if (!sizeof($group_row)) + { + trigger_error('GROUP_NOT_EXIST'); + } + + $group_row[$group_id]['group_name'] = ($group_row[$group_id]['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $group_row[$group_id]['group_name']] : $group_row[$group_id]['group_name']; + $group_row[$user->data['group_id']]['group_name'] = ($group_row[$user->data['group_id']]['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $group_row[$user->data['group_id']]['group_name']] : $group_row[$user->data['group_id']]['group_name']; + + + switch ($action) + { + case 'change_default': + // User already having this group set as default? + if ($group_id == $user->data['group_id']) + { + trigger_error($user->lang['ALREADY_DEFAULT_GROUP'] . $return_page); + } + + // User needs to be member of the group in order to make it default + if (!group_memberships($group_id, $user->data['user_id'], true)) + { + trigger_error($user->lang['NOT_MEMBER_OF_GROUP'] . $return_page); + } + + if (confirm_box(true)) + { + group_user_attributes('default', $group_id, $user->data['user_id']); + + add_log('user', $user->data['user_id'], 'LOG_USER_GROUP_CHANGE', sprintf($user->lang['USER_GROUP_CHANGE'], $group_row[$group_id]['group_name'], $group_row[$user->data['group_id']]['group_name'])); + + meta_refresh(3, $phpbb_root_path . "ucp.$phpEx$SID&i=$id&mode=$mode"); + trigger_error($user->lang['CHANGED_DEFAULT_GROUP'] . $return_page); + } + else + { + $s_hidden_fields = array( + 'default' => $group_id, + 'change_default'=> true + ); + + confirm_box(false, sprintf($user->lang['GROUP_CHANGE_DEFAULT'], $group_row[$group_id]['group_name']), build_hidden_fields($s_hidden_fields)); + } + + break; + + case 'resign': + + if (!($row = group_memberships($group_id, $user->data['user_id']))) + { + trigger_error($user->lang['NOT_MEMBER_OF_GROUP'] . $return_page); + } + list(, $row) = each($row); + + if (confirm_box(true)) + { + group_user_del($group_id, $user->data['user_id']); + + add_log('user', $user->data['user_id'], 'LOG_USER_GROUP_RESIGN', $group_row[$group_id]['group_name']); + + meta_refresh(3, $phpbb_root_path . "ucp.$phpEx$SID&i=$id&mode=$mode"); + trigger_error($user->lang[($row['user_pending']) ? 'GROUP_RESIGNED_PENDING' : 'GROUP_RESIGNED_MEMBERSHIP'] . $return_page); + } + else + { + $s_hidden_fields = array( + 'selected' => $group_id, + 'action' => 'resign', + 'submit' => true + ); + + confirm_box(false, ($row['user_pending']) ? 'GROUP_RESIGN_PENDING' : 'GROUP_RESIGN_MEMBERSHIP', build_hidden_fields($s_hidden_fields)); + } + + break; + + case 'join': + + if (group_memberships($group_id, $user->data['user_id'], true)) + { + trigger_error($user->lang['ALREADY_IN_GROUP'] . $return_page); + } + + // Check permission to join (open group or request) + if ($group_row[$group_id]['group_type'] != GROUP_OPEN && $group_row[$group_id]['group_type'] != GROUP_FREE) + { + trigger_error($user->lang['CANNOT_JOIN_GROUP'] . $return_page); + } + + if (confirm_box(true)) + { + if ($group_row[$group_id]['group_type'] == GROUP_FREE) + { + group_user_add($group_id, $user->data['user_id']); + + $email_template = 'group_added'; + } + else + { + group_user_add($group_id, $user->data['user_id'], false, false, false, 0, 1); + + $email_template = 'group_request'; + } + + include_once($phpbb_root_path . 'includes/functions_messenger.'.$phpEx); + $messenger = new messenger(); + + $email_sig = str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']); + + $sql = 'SELECT u.username, u.user_email, u.user_notify_type, u.user_jabber, u.user_lang + FROM ' . USER_GROUP_TABLE . ' ug, ' . USERS_TABLE . ' u + WHERE ug.user_id = u.user_id + AND ' . (($group_row[$group_id]['group_type'] == GROUP_FREE) ? "ug.user_id = {$user->data['user_id']}" : 'ug.group_leader = 1') . " + AND ug.group_id = $group_id"; + $result = $db->sql_query($sql); + + while ($row = $db->sql_fetchrow($result)) + { + $messenger->template($email_template, $row['user_lang']); + + $messenger->replyto($config['board_email']); + $messenger->to($row['user_email'], $row['username']); + $messenger->im($row['user_jabber'], $row['username']); + + $messenger->assign_vars(array( + 'EMAIL_SIG' => $email_sig, + 'SITENAME' => $config['sitename'], + 'USERNAME' => $row['username'], + 'GROUP_NAME' => $group_row[$group_id]['group_name'], + + 'U_PENDING' => generate_board_url() . "/ucp.$phpEx?i=usergroups&mode=manage", + 'U_GROUP' => generate_board_url() . "/memberlist.$phpEx?mode=group&g=$group_id") + ); + + $messenger->send($row['user_notify_type']); + $messenger->reset(); + } + $db->sql_freeresult($result); + + $messenger->save_queue(); + + add_log('user', $user->data['user_id'], 'LOG_USER_GROUP_JOIN' . (($group_row[$group_id]['group_type'] == GROUP_FREE) ? '' : '_PENDING'), $group_row[$group_id]['group_name']); + + meta_refresh(3, $phpbb_root_path . "ucp.$phpEx$SID&i=$id&mode=$mode"); + trigger_error($user->lang[($group_row[$group_id]['group_type'] == GROUP_FREE) ? 'GROUP_JOINED' : 'GROUP_JOINED_PENDING'] . $return_page); + } + else + { + $s_hidden_fields = array( + 'selected' => $group_id, + 'action' => 'join', + 'submit' => true + ); + + confirm_box(false, ($group_row[$group_id]['group_type'] == GROUP_FREE) ? 'GROUP_JOIN' : 'GROUP_JOIN_PENDING', build_hidden_fields($s_hidden_fields)); + } + + break; + + case 'demote': + + if (!($row = group_memberships($group_id, $user->data['user_id']))) + { + trigger_error($user->lang['NOT_MEMBER_OF_GROUP'] . $return_page); + } + list(, $row) = each($row); + + if (!$row['group_leader']) + { + trigger_error($user->lang['NOT_LEADER_OF_GROUP'] . $return_page); + } + + if (confirm_box(true)) + { + group_user_attributes('demote', $group_id, $user->data['user_id']); + + add_log('user', $user->data['user_id'], 'LOG_USER_GROUP_DEMOTE', $group_row[$group_id]['group_name']); + + meta_refresh(3, $phpbb_root_path . "ucp.$phpEx$SID&i=$id&mode=$mode"); + trigger_error($user->lang['USER_GROUP_DEMOTED'] . $return_page); + } + else + { + $s_hidden_fields = array( + 'selected' => $group_id, + 'action' => 'demote', + 'submit' => true + ); + + confirm_box(false, 'USER_GROUP_DEMOTE', build_hidden_fields($s_hidden_fields)); + } + + break; + } + } + $sql = 'SELECT g.group_id, g.group_name, g.group_description, g.group_type, ug.group_leader, ug.user_pending FROM ' . GROUPS_TABLE . ' g, ' . USER_GROUP_TABLE . ' ug *************** *** 42,45 **** --- 261,287 ---- $block = ($row['group_leader']) ? 'leader' : (($row['user_pending']) ? 'pending' : 'member'); + switch ($row['group_type']) + { + case GROUP_OPEN: + $group_status = 'OPEN'; + break; + + case GROUP_CLOSED: + $group_status = 'CLOSED'; + break; + + case GROUP_HIDDEN: + $group_status = 'HIDDEN'; + break; + + case GROUP_SPECIAL: + $group_status = 'SPECIAL'; + break; + + case GROUP_FREE: + $group_status = 'FREE'; + break; + } + $template->assign_block_vars($block, array( 'GROUP_ID' => $row['group_id'], *************** *** 47,55 **** 'GROUP_DESC' => ($row['group_type'] <> GROUP_SPECIAL) ? $row['group_description'] : $user->lang['GROUP_IS_SPECIAL'], 'GROUP_SPECIAL' => ($row['group_type'] <> GROUP_SPECIAL) ? false : true, ! 'U_VIEW_GROUP' => "memberlist.$phpEx$SID&mode=group&g=" . $row['group_id'], 'S_GROUP_DEFAULT' => ($row['group_id'] == $user->data['group_id']) ? true : false, ! 'S_ROW_COUNT' => ${$block . '_count'}++,) ); --- 289,298 ---- 'GROUP_DESC' => ($row['group_type'] <> GROUP_SPECIAL) ? $row['group_description'] : $user->lang['GROUP_IS_SPECIAL'], 'GROUP_SPECIAL' => ($row['group_type'] <> GROUP_SPECIAL) ? false : true, + 'GROUP_STATUS' => $user->lang['GROUP_IS_' . $group_status], ! 'U_VIEW_GROUP' => "{$phpbb_root_path}memberlist.$phpEx$SID&mode=group&g={$row['group_id']}", 'S_GROUP_DEFAULT' => ($row['group_id'] == $user->data['group_id']) ? true : false, ! 'S_ROW_COUNT' => ${$block . '_count'}++) ); *************** *** 70,84 **** while ($row = $db->sql_fetchrow($result)) { $template->assign_block_vars('nonmember', array( 'GROUP_ID' => $row['group_id'], 'GROUP_NAME' => ($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name'], ! 'GROUP_DESC' => $row['group_description'], 'GROUP_SPECIAL' => ($row['group_type'] <> GROUP_SPECIAL) ? false : true, 'GROUP_CLOSED' => ($row['group_type'] <> GROUP_CLOSED || $auth->acl_gets('a_group', 'a_groupadd', 'a_groupdel')) ? false : true, ! 'U_VIEW_GROUP' => "memberlist.$phpEx$SID&mode=group&g=" . $row['group_id'], ! 'S_ROW_COUNT' => $nonmember_count++,) ); } --- 313,351 ---- while ($row = $db->sql_fetchrow($result)) { + switch ($row['group_type']) + { + case GROUP_OPEN: + $group_status = 'OPEN'; + break; + + case GROUP_CLOSED: + $group_status = 'CLOSED'; + break; + + case GROUP_HIDDEN: + $group_status = 'HIDDEN'; + break; + + case GROUP_SPECIAL: + $group_status = 'SPECIAL'; + break; + + case GROUP_FREE: + $group_status = 'FREE'; + break; + } $template->assign_block_vars('nonmember', array( 'GROUP_ID' => $row['group_id'], 'GROUP_NAME' => ($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name'], ! 'GROUP_DESC' => ($row['group_type'] <> GROUP_SPECIAL) ? $row['group_description'] : $user->lang['GROUP_IS_SPECIAL'], 'GROUP_SPECIAL' => ($row['group_type'] <> GROUP_SPECIAL) ? false : true, 'GROUP_CLOSED' => ($row['group_type'] <> GROUP_CLOSED || $auth->acl_gets('a_group', 'a_groupadd', 'a_groupdel')) ? false : true, + 'GROUP_STATUS' => $user->lang['GROUP_IS_' . $group_status], + 'S_CAN_JOIN' => ($row['group_type'] == GROUP_OPEN || $row['group_type'] == GROUP_FREE) ? true : false, ! 'U_VIEW_GROUP' => "{$phpbb_root_path}memberlist.$phpEx$SID&mode=group&g={$row['group_id']}", ! 'S_ROW_COUNT' => $nonmember_count++) ); } *************** *** 90,94 **** 'S_MEMBER_COUNT' => $member_count, 'S_PENDING_COUNT' => $pending_count, ! 'S_NONMEMBER_COUNT' => $nonmember_count,) ); --- 357,363 ---- 'S_MEMBER_COUNT' => $member_count, 'S_PENDING_COUNT' => $pending_count, ! 'S_NONMEMBER_COUNT' => $nonmember_count, ! ! 'S_UCP_ACTION' => "{$phpbb_root_path}ucp.$phpEx$SID&i=$id&mode=$mode") ); *************** *** 99,127 **** } ! $this->display($user->lang['UCP_GROUPS'], 'ucp_groups_' . $mode . '.html'); } } - /* - include($phpbb_root_path . 'includes/emailer.'.$phpEx); - $emailer = new emailer($config['smtp_delivery']); - - $email_headers = 'From: ' . $config['board_email'] . "\nReturn-Path: " . $config['board_email'] . "\r\n"; - - $emailer->use_template('group_request', $moderator['user_lang']); - $emailer->email_address($moderator['user_email']); - $emailer->set_subject();//$lang['Group_request'] - $emailer->extra_headers($email_headers); - - $emailer->assign_vars(array( - 'SITENAME' => $config['sitename'], - 'GROUP_MODERATOR' => $moderator['username'], - 'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']), - - 'U_GROUPCP' => $server_url . '?' . 'g' . "=$group_id&validate=true") - ); - $emailer->send(); - $emailer->reset(); - */ - ?> \ No newline at end of file --- 368,374 ---- } ! $this->display($user->lang['UCP_GROUPS_' . strtoupper($mode)], 'ucp_groups_' . $mode . '.html'); } } ?> \ No newline at end of file Index: ucp_pm_compose.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/includes/ucp/ucp_pm_compose.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -r1.12 -r1.13 *** ucp_pm_compose.php 15 May 2005 20:17:34 -0000 1.12 --- ucp_pm_compose.php 19 Aug 2005 10:53:52 -0000 1.13 *************** *** 245,250 **** // $folder_id = request_var('f', PRIVMSGS_NO_BOX); - $s_hidden_fields = '<input type="hidden" name="p" value="' . $msg_id . '" /><input type="hidden" name="f" value="' . $folder_id . '" /><input type="hidden" name="action" value="delete" />'; - // Do we need to confirm ? if (confirm_box(true)) --- 245,248 ---- *************** *** 262,267 **** else { // "{$phpbb_root_path}ucp.$phpEx$SID&i=pm&mode=compose" ! confirm_box(false, 'DELETE_MESSAGE', $s_hidden_fields); } } --- 260,271 ---- else { + $s_hidden_fields = array( + 'p' => $msg_id, + 'f' => $folder_id, + 'action'=> 'delete' + ); + // "{$phpbb_root_path}ucp.$phpEx$SID&i=pm&mode=compose" ! confirm_box(false, 'DELETE_MESSAGE', build_hidden_fields($s_hidden_fields)); } } Index: ucp_pm_options.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/includes/ucp/ucp_pm_options.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** ucp_pm_options.php 15 May 2005 20:17:34 -0000 1.8 --- ucp_pm_options.php 19 Aug 2005 10:53:52 -0000 1.9 *************** *** 159,166 **** } ! $s_hidden_fields = '<input type="hidden" name="remove_folder_id" value="' . $remove_folder_id . '" />'; ! $s_hidden_fields .= '<input type="hidden" name="remove_action" value="' . $remove_action . '" />'; ! $s_hidden_fields .= '<input type="hidden" name="move_to" value="' . $move_to . '" />'; ! $s_hidden_fields .= '<input type="hidden" name="remove_folder" value="1" />'; // Do we need to confirm? --- 159,168 ---- } ! $s_hidden_fields = array( ! 'remove_folder_id' => $remove_folder_id, ! 'remove_action' => $remove_action, ! 'move_to' => $move_to, ! 'remove_folder' => 1 ! ); // Do we need to confirm? *************** *** 227,231 **** else { ! confirm_box(false, 'REMOVE_FOLDER', $s_hidden_fields); } } --- 229,233 ---- else { ! confirm_box(false, 'REMOVE_FOLDER', build_hidden_fields($s_hidden_fields)); } } *************** *** 296,301 **** } - $s_hidden_fields = '<input type="hidden" name="delete_rule[' . $delete_id . ']" value="1" />'; - // Do we need to confirm? if (confirm_box(true)) --- 298,301 ---- *************** *** 315,319 **** else { ! confirm_box(false, 'DELETE_RULE', $s_hidden_fields); } } --- 315,319 ---- else { ! confirm_box(false, 'DELETE_RULE', build_hidden_fields(array('delete_rule' => array($delete_id => 1)))); } } Index: ucp_register.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/includes/ucp/ucp_register.php,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -r1.36 -r1.37 *** ucp_register.php 9 Apr 2005 12:26:43 -0000 1.36 --- ucp_register.php 19 Aug 2005 10:53:52 -0000 1.37 *************** *** 373,378 **** } ! $s_hidden_fields = '<input type="hidden" name="agreed" value="true" /><input type="hidden" name="coppa" value="' . $coppa . '" />'; ! $s_hidden_fields .= '<input type="hidden" name="change_lang" value="0" />'; $confirm_image = ''; --- 373,381 ---- } ! $s_hidden_fields = build_hidden_fields(array( ! 'agreed' => 'true', ! 'coppa' => $coppa, ! 'change_lang' => 0) ! ); $confirm_image = ''; |
