ucp -> groups -> memberships

git-svn-id: file:///svn/phpbb/trunk@5202 89ea8834-ac86-4346-8a33-228a782c2dd0
author: Meik Sievertsen <acydburn@phpbb.com> 2005-08-19 10:56:46 +0000
committer: Meik Sievertsen <acydburn@phpbb.com> 2005-08-19 10:56:46 +0000
commit: 4b9215bd14bc72edeff20a40962d0bd89b21718e (patch)
tree: 554c9a7a023392148772c75fd887d7fecf6ba2c8 /phpBB/includes/ucp
parent: 9d825c0e200de129c84df55fe8d77ad2964bd2c1 (diff)
download: forums-4b9215bd14bc72edeff20a40962d0bd89b21718e.tar
forums-4b9215bd14bc72edeff20a40962d0bd89b21718e.tar.gz
forums-4b9215bd14bc72edeff20a40962d0bd89b21718e.tar.bz2
forums-4b9215bd14bc72edeff20a40962d0bd89b21718e.tar.xz
forums-4b9215bd14bc72edeff20a40962d0bd89b21718e.zip
5 files changed, 300 insertions, 45 deletions
diff --git a/phpBB/includes/ucp/ucp_attachments.php b/phpBB/includes/ucp/ucp_attachments.php
index 2e479b0654..9e8cd2d2e8 100644
--- a/phpBB/includes/ucp/ucp_attachments.php
+++ b/phpBB/includes/ucp/ucp_attachments.php
@@ -26,10 +26,11 @@ class ucp_attachments extends module
 		
 		if ($delete && sizeof($delete_ids))
 		{
-			$s_hidden_fields = '<input type="hidden" name="delete" value="1" />';
+			$s_hidden_fields = array('delete' => 1);
+
 			foreach ($delete_ids as $attachment_id)
 			{
-				$s_hidden_fields .= '<input type="hidden" name="attachment[' . $attachment_id . ']" value="1" />';
+				$s_hidden_fields['attachment'][$attachment_id] = 1;
 			}
 
 			if (confirm_box(true))
@@ -44,7 +45,7 @@ class ucp_attachments extends module
 			}
 			else
 			{
-				confirm_box(false, (sizeof($delete_ids) == 1) ? 'DELETE_ATTACHMENT' : 'DELETE_ATTACHMENTS', $s_hidden_fields);
+				confirm_box(false, (sizeof($delete_ids) == 1) ? 'DELETE_ATTACHMENT' : 'DELETE_ATTACHMENTS', build_hidden_fields($s_hidden_fields));
 			}
 		}
 		
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index 68b6ad1c68..dbcd859997 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -20,6 +20,8 @@ class ucp_groups extends module
 
 		$user->add_lang('groups');
 
+		$return_page = '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $phpbb_root_path . "ucp.$phpEx$SID&amp;i=$id&amp;mode=$mode\">", '</a>');
+
 		$submit		= (!empty($_POST['submit'])) ? true : false;
 		$delete		= (!empty($_POST['delete'])) ? true : false;
 		$error = $data = array();
@@ -28,6 +30,223 @@ class ucp_groups extends module
 		{
 			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&amp;i=$id&amp;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&amp;i=$id&amp;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&amp;mode=manage",
+										'U_GROUP'		=> generate_board_url() . "/memberlist.$phpEx?mode=group&amp;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&amp;i=$id&amp;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&amp;i=$id&amp;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
 					WHERE ug.user_id = ' . $user->data['user_id'] . '
@@ -41,16 +260,40 @@ class ucp_groups extends module
 				{
 					$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'],
 						'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_STATUS'	=> $user->lang['GROUP_IS_' . $group_status],
 
-						'U_VIEW_GROUP'	=> "memberlist.$phpEx$SID&amp;mode=group&amp;g=" . $row['group_id'],
+						'U_VIEW_GROUP'	=> "{$phpbb_root_path}memberlist.$phpEx$SID&amp;mode=group&amp;g={$row['group_id']}",
 
 						'S_GROUP_DEFAULT'	=> ($row['group_id'] == $user->data['group_id']) ? true : false,
-						'S_ROW_COUNT'		=> ${$block . '_count'}++,)
+						'S_ROW_COUNT'		=> ${$block . '_count'}++)
 					);
 
 					$group_id_ary[] = $row['group_id'];
@@ -69,17 +312,41 @@ class ucp_groups extends module
 				$nonmember_count = 0;
 				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_description'],
+						'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'	=> "memberlist.$phpEx$SID&amp;mode=group&amp;g=" . $row['group_id'],
+						'U_VIEW_GROUP'	=> "{$phpbb_root_path}memberlist.$phpEx$SID&amp;mode=group&amp;g={$row['group_id']}",
 
-						'S_ROW_COUNT'	=> $nonmember_count++,)
+						'S_ROW_COUNT'	=> $nonmember_count++)
 					);
 				}
 				$db->sql_freeresult($result);
@@ -89,7 +356,9 @@ class ucp_groups extends module
 					'S_LEADER_COUNT'	=> $leader_count,
 					'S_MEMBER_COUNT'	=> $member_count,
 					'S_PENDING_COUNT'	=> $pending_count,
-					'S_NONMEMBER_COUNT'	=> $nonmember_count,)
+					'S_NONMEMBER_COUNT'	=> $nonmember_count,
+					
+					'S_UCP_ACTION'			=> "{$phpbb_root_path}ucp.$phpEx$SID&amp;i=$id&amp;mode=$mode")
 				);
 
 				break;
@@ -98,30 +367,8 @@ class ucp_groups extends module
 				break;
 		}
 
-		$this->display($user->lang['UCP_GROUPS'], 'ucp_groups_' . $mode . '.html');
+		$this->display($user->lang['UCP_GROUPS_' . strtoupper($mode)], '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
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php
index 80a9c7676e..e1302bf470 100644
--- a/phpBB/includes/ucp/ucp_pm_compose.php
+++ b/phpBB/includes/ucp/ucp_pm_compose.php
@@ -244,8 +244,6 @@ function compose_pm($id, $mode, $action)
 		// Folder id has been determined by the SQL Statement
 		// $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))
 		{
@@ -261,8 +259,14 @@ function compose_pm($id, $mode, $action)
 		}
 		else
 		{
+			$s_hidden_fields = array(
+				'p'		=> $msg_id,
+				'f'		=> $folder_id,
+				'action'=> 'delete'
+			);
+
 			// "{$phpbb_root_path}ucp.$phpEx$SID&amp;i=pm&amp;mode=compose"
-			confirm_box(false, 'DELETE_MESSAGE', $s_hidden_fields);
+			confirm_box(false, 'DELETE_MESSAGE', build_hidden_fields($s_hidden_fields));
 		}
 	}
 
diff --git a/phpBB/includes/ucp/ucp_pm_options.php b/phpBB/includes/ucp/ucp_pm_options.php
index 129c6cb84f..bb0a22102b 100644
--- a/phpBB/includes/ucp/ucp_pm_options.php
+++ b/phpBB/includes/ucp/ucp_pm_options.php
@@ -158,10 +158,12 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit
 			trigger_error('CANNOT_REMOVE_FOLDER');
 		}
 
-		$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" />';
+		$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?
 		if (confirm_box(true))
@@ -226,7 +228,7 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit
 		}
 		else
 		{
-			confirm_box(false, 'REMOVE_FOLDER', $s_hidden_fields);
+			confirm_box(false, 'REMOVE_FOLDER', build_hidden_fields($s_hidden_fields));
 		}
 	}
 
@@ -295,8 +297,6 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit
 			redirect("{$phpbb_root_path}ucp.$phpEx$SID&amp;i=pm&amp;mode=$mode");
 		}
 
-		$s_hidden_fields = '<input type="hidden" name="delete_rule[' . $delete_id . ']" value="1" />';
-
 		// Do we need to confirm?
 		if (confirm_box(true))
 		{
@@ -314,7 +314,7 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit
 		}
 		else
 		{
-			confirm_box(false, 'DELETE_RULE', $s_hidden_fields);
+			confirm_box(false, 'DELETE_RULE', build_hidden_fields(array('delete_rule' => array($delete_id => 1))));
 		}
 	}
 	
diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php
index 1a0c0e5eb9..775f3650cf 100644
--- a/phpBB/includes/ucp/ucp_register.php
+++ b/phpBB/includes/ucp/ucp_register.php
@@ -372,8 +372,11 @@ class ucp_register extends module
 			}
 		}
 
-		$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" />';
+		$s_hidden_fields = build_hidden_fields(array(
+			'agreed'	=> 'true', 
+			'coppa'		=> $coppa,
+			'change_lang'	=> 0)
+		);
 
 		$confirm_image = '';
 		// Visual Confirmation - Show images
author	Meik Sievertsen <acydburn@phpbb.com>	2005-08-19 10:56:46 +0000
committer	Meik Sievertsen <acydburn@phpbb.com>	2005-08-19 10:56:46 +0000
commit	4b9215bd14bc72edeff20a40962d0bd89b21718e (patch)
tree	554c9a7a023392148772c75fd887d7fecf6ba2c8 /phpBB/includes/ucp
parent	9d825c0e200de129c84df55fe8d77ad2964bd2c1 (diff)
download	forums-4b9215bd14bc72edeff20a40962d0bd89b21718e.tar forums-4b9215bd14bc72edeff20a40962d0bd89b21718e.tar.gz forums-4b9215bd14bc72edeff20a40962d0bd89b21718e.tar.bz2 forums-4b9215bd14bc72edeff20a40962d0bd89b21718e.tar.xz forums-4b9215bd14bc72edeff20a40962d0bd89b21718e.zip