diff --git a/phpBB/groupcp.php b/phpBB/groupcp.php index ac39f53cb6..afb2e4d2bf 100644 --- a/phpBB/groupcp.php +++ b/phpBB/groupcp.php @@ -26,9 +26,6 @@ $phpbb_root_path = "./"; include($phpbb_root_path . 'extension.inc'); include($phpbb_root_path . 'common.'.$phpEx); -$pagetype = "groupcp"; -$page_title = $lang['Group_Control_Panel']; - // // Start session management // @@ -43,10 +40,10 @@ if(!isset($HTTP_GET_VARS['start'])) $start = 0; } - // // Page header // +$page_title = $lang['Group_Control_Panel']; include($phpbb_root_path . 'includes/page_header.'.$phpEx); // @@ -54,20 +51,86 @@ include($phpbb_root_path . 'includes/page_header.'.$phpEx); // if( isset($HTTP_POST_VARS['joingroup']) ) { + $sql = "INSERT INTO ".USER_GROUP_TABLE." (group_id, user_id, user_pending) values (".$HTTP_POST_VARS[POST_GROUPS_URL].", ".$userdata['user_id'].", 1)"; + if(!$result = $db->sql_query($sql, BEGIN_TRANSACTION)) + { + message_die(GENERAL_ERROR, "Error inserting user group subscription", "Error", __LINE__, __FILE__, $sql); + } + $sql = "SELECT u.user_email, u.username, g.group_name FROM ".USERS_TABLE . " u, " . GROUPS_TABLE . " g + WHERE u.user_id = g.group_moderator AND g.group_id = ".$HTTP_POST_VARS[POST_GROUPS_URL]; + if(!$result = $db->sql_query($sql, END_TRANSACTION)) + { + message_die(GENERAL_ERROR, "Error getting group moderator data", "Error", __LINE__, __FILE__, $sql); + } + $moderator = $db->sql_fetchrowset($result); + + $email_headers = "From: " . $board_config['board_email_from'] . "\r\n"; + + $emailer->use_template("group_request"); + $emailer->email_address($moderator[0]['user_email']); + $emailer->set_subject($lang['Group_request']); + $emailer->extra_headers($email_headers); + + $emailer->assign_vars(array( + "SITENAME" => $board_config['sitename'], + "GROUP_MODERATOR" => $moderator[0]['username'], + "U_GROUPCP" => "http://".$SERVER_NAME.$PHP_SELF."?".POST_GROUPS_URL."=".$HTTP_POST_VARS[POST_GROUPS_URL], + "EMAIL_SIG" => $board_config['board_email']) + ); + $emailer->send(); + $emailer->reset(); + + message_die(GENERAL_MESSAGE, $lang["Group_joined"], $lang['Subscribe']); } else if( isset($HTTP_GET_VARS[POST_GROUPS_URL]) || isset($HTTP_POST_VARS[POST_GROUPS_URL]) ) { + // + // Handle approvals and denials + // + if(isset($HTTP_POST_VARS['approve']) || isset($HTTP_POST_VARS['deny'])) + { + + $members = $HTTP_POST_VARS['member']; + + if(isset($HTTP_POST_VARS['approve'])) + { + $sql = "UPDATE ".USER_GROUP_TABLE." SET user_pending = 0 WHERE "; + } + else if(isset($HTTP_POST_VARS['deny'])) + { + $sql = "DELETE FROM ".USER_GROUP_TABLE." WHERE "; + } + + for($x = 0; $x < count($members); $x++) + { + if($x > 0) + { + $sql .= " OR "; + } + $sql .= "user_id = ".$members[$x]; + } + + if(!$result = $db->sql_query($sql)) + { + message_die(GENERAL_ERROR, "Could not update user group table.", "Error", __LINE__, __FILE__, $sql); + } + } + // + // END approve or deny + // $group_id = ( isset($HTTP_POST_VARS[POST_GROUPS_URL]) ) ? $HTTP_POST_VARS[POST_GROUPS_URL] : $HTTP_GET_VARS[POST_GROUPS_URL]; + $start = ( isset($HTTP_GET_VARS['start']) ) ? $HTTP_GET_VARS['start'] : 0; + // // Get group details // - $sql = "SELECT * - FROM " . GROUPS_TABLE . " - WHERE group_id = $group_id + $sql = "SELECT * + FROM " . GROUPS_TABLE . " + WHERE group_id = $group_id AND group_single_user = 0"; if(!$result = $db->sql_query($sql)) { @@ -82,11 +145,13 @@ else if( isset($HTTP_GET_VARS[POST_GROUPS_URL]) || isset($HTTP_POST_VARS[POST_GR // // Get user information for this group // - $sql = "SELECT u.username, u.user_id, u.user_viewemail, u.user_posts, u.user_regdate, u.user_from, u.user_website, u.user_email, u.user_icq, u.user_aim, u.user_yim, u.user_msnm, u.user_avatar - FROM " . USERS_TABLE . " u, " . USER_GROUP_TABLE . " ug - WHERE ug.group_id = $group_id - AND u.user_id = ug.user_id - ORDER BY u.user_regdate"; + $sql = "SELECT u.username, u.user_id, u.user_viewemail, u.user_posts, u.user_regdate, u.user_from, u.user_website, u.user_email, u.user_icq, u.user_aim, u.user_yim, u.user_msnm + FROM " . USERS_TABLE . " u, " . USER_GROUP_TABLE . " ug + WHERE ug.group_id = $group_id + AND u.user_id = ug.user_id + AND ug.user_pending = 0 + ORDER BY u.user_regdate + LIMIT $start, " . $board_config['topics_per_page']; if(!$result = $db->sql_query($sql)) { message_die(GENERAL_ERROR, "Error getting user list for group", "", __LINE__, __FILE__, $sql); @@ -101,7 +166,6 @@ else if( isset($HTTP_GET_VARS[POST_GROUPS_URL]) || isset($HTTP_POST_VARS[POST_GR // $template->set_filenames(array( "info" => "groupcp_info_body.tpl", - "list" => "groupcp_list_body.tpl", "jumpbox" => "jumpbox.tpl") ); @@ -131,7 +195,7 @@ else if( isset($HTTP_GET_VARS[POST_GROUPS_URL]) || isset($HTTP_POST_VARS[POST_GR } else if($is_group_member) { - $group_details = $lang['Member_this_group'] . " "; + $group_details = $lang['Member_this_group'] . " "; $s_hidden_fields = ""; } else @@ -141,8 +205,8 @@ else if( isset($HTTP_GET_VARS[POST_GROUPS_URL]) || isset($HTTP_POST_VARS[POST_GR // // I don't like this being here ... // - $group_details = $lang['This_open_group'] . " "; - $s_hidden_fields = ""; + $group_details = $lang['This_open_group'] . " "; + $s_hidden_fields = ""; } else { @@ -154,47 +218,42 @@ else if( isset($HTTP_GET_VARS[POST_GROUPS_URL]) || isset($HTTP_POST_VARS[POST_GR $template->assign_vars(array( "L_GROUP_INFORMATION" => $lang['Group_Information'], "L_GROUP_NAME" => $lang['Group_name'], - "L_GROUP_DESC" => $lang['Group_description'], + "L_GROUP_DESC" => $lang['Group_description'], "L_GROUP_MEMBERSHIP" => $lang['Group_membership'], - "L_SUBSCRIBE" => $lang['Subscribe'], - "L_UNSUBSCRIBE" => $lang['Unsubscribe'], + "L_SUBSCRIBE" => $lang['Subscribe'], + "L_UNSUBSCRIBE" => $lang['Unsubscribe'], "GROUP_NAME" => $group_info['group_name'], "GROUP_DESC" => $group_info['group_description'], "GROUP_DETAILS" => $group_details, - - "S_GROUP_INFO_ACTION" => append_sid("groupcp.$phpEx"), + + "S_GROUP_INFO_ACTION" => append_sid("groupcp.$phpEx"), "S_HIDDEN_FIELDS" => $s_hidden_fields) ); - // - // Parse group info output - // - $template->pparse("info"); - // // Generate memberlist if there any! // if( $members_count ) { $template->assign_vars(array( - "L_SELECT_SORT_METHOD" => $lang['Select_sort_method'], + "L_SELECT_SORT_METHOD" => $lang['Select_sort_method'], "L_EMAIL" => $lang['Email'], "L_WEBSITE" => $lang['Website'], - "L_FROM" => $lang['From'], - "L_ORDER" => $lang['Order'], - "L_SORT" => $lang['Sort'], - "L_SUBMIT" => $lang['Sort'], - "L_AIM" => $lang['AIM'], - "L_YIM" => $lang['YIM'], - "L_MSNM" => $lang['MSNM'], - "L_ICQ" => $lang['ICQ'], + "L_FROM" => $lang['From'], + "L_ORDER" => $lang['Order'], + "L_SORT" => $lang['Sort'], + "L_SUBMIT" => $lang['Sort'], + "L_AIM" => $lang['AIM'], + "L_YIM" => $lang['YIM'], + "L_MSNM" => $lang['MSNM'], + "L_ICQ" => $lang['ICQ'], "S_MODE_SELECT" => $select_sort_mode, - "S_ORDER_SELECT" => $select_sort_order, + "S_ORDER_SELECT" => $select_sort_order, "S_MODE_ACTION" => append_sid("groupcp.$phpEx?" . POST_GROUPS_URL . "=$group_id")) ); - + for($i = 0; $i < $members_count; $i++) { $username = stripslashes($group_members[$i]['username']); @@ -205,11 +264,11 @@ else if( isset($HTTP_GET_VARS[POST_GROUPS_URL]) || isset($HTTP_POST_VARS[POST_GR $joined = create_date($board_config['default_dateformat'], $group_members[$i]['user_regdate'], $board_config['default_timezone']); $posts = ($group_members[$i]['user_posts']) ? $group_members[$i]['user_posts'] : 0; - + if( !empty($group_members[$i]['user_viewemail']) ) { $altered_email = str_replace("@", " at ", $group_members[$i]['user_email']); - $email_img = "\"""; + $email_img = "\"""; } else { @@ -217,7 +276,7 @@ else if( isset($HTTP_GET_VARS[POST_GROUPS_URL]) || isset($HTTP_POST_VARS[POST_GR } $pm_img = "\"""; - + if($group_members[$i]['user_website'] != "") { $www_img = ""; @@ -231,14 +290,14 @@ else if( isset($HTTP_GET_VARS[POST_GROUPS_URL]) || isset($HTTP_POST_VARS[POST_GR { $icq_status_img = ""; - $icq_add_img = "\""."; + $icq_add_img = "\""."; } else { $icq_status_img = " "; $icq_add_img = " "; } - + $aim_img = ($group_members[$i]['user_aim']) ? "" : " "; $msn_img = ($group_members[$i]['user_msnm']) ? "" : " "; @@ -247,21 +306,13 @@ else if( isset($HTTP_GET_VARS[POST_GROUPS_URL]) || isset($HTTP_POST_VARS[POST_GR $search_img = ""; - if(!($i % 2)) - { - $row_color = "#" . $theme['td_color1']; - } - else - { - $row_color = "#" . $theme['td_color2']; - } - if($user_id == $group_info['group_moderator']) { $template->assign_vars(array( - "U_MOD_VIEWPROFILE" => append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $user_id), - - "MOD_ROW_COLOR" => $row_color, + "U_MOD_VIEWPROFILE" => append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $user_id), + + "MOD_ROW_COLOR" => "#" . $theme['td_color1'], + "MOD_ROW_CLASS" => $theme['td_class1'], "MOD_USERNAME" => $username, "MOD_FROM" => $from, "MOD_JOINED" => $joined, @@ -270,20 +321,22 @@ else if( isset($HTTP_GET_VARS[POST_GROUPS_URL]) || isset($HTTP_POST_VARS[POST_GR "MOD_EMAIL_IMG" => $email_img, "MOD_PM_IMG" => $pm_img, "MOD_WWW_IMG" => $www_img, - "MOD_ICQ_STATUS_IMG" => $icq_status_img, - "MOD_ICQ_ADD_IMG" => $icq_add_img, - "MOD_AIM_IMG" => $aim_img, - "MOD_YIM_IMG" => $yim_img, - "MOD_MSN_IMG" => $msn_img, + "MOD_ICQ_STATUS_IMG" => $icq_status_img, + "MOD_ICQ_ADD_IMG" => $icq_add_img, + "MOD_AIM_IMG" => $aim_img, + "MOD_YIM_IMG" => $yim_img, + "MOD_MSN_IMG" => $msn_img, "MOD_SEARCH_IMG" => $search) ); } else { + $row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2']; + $row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2']; + $template->assign_block_vars("memberrow", array( - "U_VIEWPROFILE" => append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $user_id), - - "ROW_COLOR" => $row_color, + "ROW_COLOR" => "#" . $row_color, + "ROW_CLASS" => $row_class, "USERNAME" => $username, "FROM" => $from, "JOINED" => $joined, @@ -292,29 +345,30 @@ else if( isset($HTTP_GET_VARS[POST_GROUPS_URL]) || isset($HTTP_POST_VARS[POST_GR "EMAIL_IMG" => $email_img, "PM_IMG" => $pm_img, "WWW_IMG" => $www_img, - "ICQ_STATUS_IMG" => $icq_status_img, - "ICQ_ADD_IMG" => $icq_add_img, - "AIM_IMG" => $aim_img, - "YIM_IMG" => $yim_img, - "MSN_IMG" => $msn_img, - "SEARCH_IMG" => $search) + "ICQ_STATUS_IMG" => $icq_status_img, + "ICQ_ADD_IMG" => $icq_add_img, + "AIM_IMG" => $aim_img, + "YIM_IMG" => $yim_img, + "MSN_IMG" => $msn_img, + "SEARCH_IMG" => $search, + + "U_VIEWPROFILE" => append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $user_id)) ); } } - +/* $pagination = generate_pagination("groupcp.$phpEx?" . POST_GROUPS_URL . "=$group_id", $users_list, $board_config['topics_per_page'], $start)." "; $template->assign_vars(array( "PAGINATION" => $pagination, "ON_PAGE" => ( floor( $start / $board_config['topics_per_page'] ) + 1 ), "TOTAL_PAGES" => ceil( $users_list / $board_config['topics_per_page'] ), - + "L_OF" => $lang['of'], "L_PAGE" => $lang['Page'], "L_GOTO_PAGE" => $lang['Goto_page']) ); - - $template->pparse("list"); +*/ } else @@ -322,15 +376,133 @@ else if( isset($HTTP_GET_VARS[POST_GROUPS_URL]) || isset($HTTP_POST_VARS[POST_GR // // No group members // + $template->assign_block_vars("nomembers", array() ); + + $template->assign_vars(array( + "L_NO_MEMBERS" => $lang['No_group_members']) + ); } + // We've displayed the members who belong to the group, now we do that pending memebers... There's probably a better way of doing this.. + $sql = "SELECT u.username, u.user_id, u.user_viewemail, u.user_posts, u.user_regdate, u.user_from, u.user_website, u.user_email, u.user_icq, u.user_aim, u.user_yim, u.user_msnm + FROM " . GROUPS_TABLE . " g, " . USER_GROUP_TABLE . " ug, " . USERS_TABLE . " u + WHERE g.group_moderator = " . $userdata['user_id'] . " + AND ug.group_id = g.group_id + AND ug.user_pending = 1 + AND u.user_id = ug.user_id + ORDER BY u.user_regdate"; + if(!$result = $db->sql_query($sql)) + { + message_die(GENERAL_ERROR, "Error getting user pending information", "", __LINE__, __FILE__, $sql); + } + if( $modgroup_pending_count = $db->sql_numrows($result) ) + { + $modgroup_pending_list = $db->sql_fetchrowset($result); + } + // + // Users pending in groups moderated by this user + // + if($modgroup_pending_count) + { + + $template->assign_vars(array("L_SELECT" => $lang['Select'], + "L_APPROVESELECTED" => $lang['Approve_selected'], + "L_DENYSELECTED" => $lang['Deny_selected'], + "S_PENDING_ACTION" => append_sid($PHP_SELF . "?" . POST_GROUPS_URL . "=" . $group_id))); + $template->assign_block_vars("pendingmembers", array() ); + for($i = 0; $i < $modgroup_pending_count; $i++) + { + $username = stripslashes($modgroup_pending_list[$i]['username']); + $user_id = $modgroup_pending_list[$i]['user_id']; + + $from = stripslashes($modgroup_pending_list[$i]['user_from']); + + $joined = create_date($board_config['default_dateformat'], $modgroup_pending_list[$i]['user_regdate'], $board_config['default_timezone']); + + $posts = ($modgroup_pending_list[$i]['user_posts']) ? $modgroup_pending_list[$i]['user_posts'] : 0; + + if( !empty($modgroup_pending_list[$i]['user_viewemail']) ) + { + $altered_email = str_replace("@", " at ", $modgroup_pending_list[$i]['user_email']); + $email_img = "\"""; + } + else + { + $email_img = " "; + } + + $pm_img = "\"""; + + if($modgroup_pending_list[$i]['user_website'] != "") + { + $www_img = ""; + } + else + { + $www_img = " "; + } + + if($modgroup_pending_list[$i]['user_icq']) + { + $icq_status_img = ""; + + $icq_add_img = "\""."; + } + else + { + $icq_status_img = " "; + $icq_add_img = " "; + } + + $aim_img = ($modgroup_pending_list[$i]['user_aim']) ? "" : " "; + + $msn_img = ($modgroup_pending_list[$i]['user_msnm']) ? "" : " "; + + $yim_img = ($modgroup_pending_list[$i]['user_yim']) ? "" : " "; + + $search_img = ""; + + $row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2']; + $row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2']; + + $user_select = ''; + + $template->assign_block_vars("pendingmembersrow", array( + "U_VIEWPROFILE" => append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $user_id), + + "ROW_CLASS" => $row_class, + "USERNAME" => $username, + "FROM" => $from, + "JOINED" => $joined, + "POSTS" => $posts, + + "EMAIL_IMG" => $email_img, + "PM_IMG" => $pm_img, + "WWW_IMG" => $www_img, + "ICQ_STATUS_IMG" => $icq_status_img, + "ICQ_ADD_IMG" => $icq_add_img, + "AIM_IMG" => $aim_img, + "YIM_IMG" => $yim_img, + "MSN_IMG" => $msn_img, + "SELECT" => $user_select, + "SEARCH_IMG" => $search) + ); + } + } + + + // + // Parse group info output + // + $template->pparse("info"); + } -else +else { - $sql = "SELECT group_id, group_name - FROM " . GROUPS_TABLE . " - WHERE group_single_user <> " . TRUE . " + $sql = "SELECT group_id, group_name + FROM " . GROUPS_TABLE . " + WHERE group_single_user <> " . TRUE . " ORDER BY group_name"; if(!$result = $db->sql_query($sql)) { @@ -342,11 +514,11 @@ else } $group_list = $db->sql_fetchrowset($result); - $sql = "SELECT g.group_id, g.group_name, ug.user_pending - FROM " . GROUPS_TABLE . " g, " . USER_GROUP_TABLE . " ug + $sql = "SELECT g.group_id, g.group_name, ug.user_pending + FROM " . GROUPS_TABLE . " g, " . USER_GROUP_TABLE . " ug WHERE ug.user_id = " . $userdata['user_id'] . " - AND g.group_id = ug.group_id - AND g.group_single_user <> " . TRUE . " + AND g.group_id = ug.group_id + AND g.group_single_user <> " . TRUE . " ORDER BY g.group_name"; if(!$result = $db->sql_query($sql)) { @@ -385,14 +557,28 @@ else $s_member_groups_opt .= ''; } } + if($s_pending_groups_opt != "" || $s_member_groups_opt != "") + { + $template->assign_block_vars("group_joined", array() ); + } + if($s_member_groups_opt == "") { $s_member_groups_opt = ""; } + else + { + $template->assign_block_vars("group_joined.group_member", array() ); + } + if($s_pending_groups_opt == "") { $s_pending_groups_opt = ""; } + else + { + $template->assign_block_vars("group_joined.group_pending", array() ); + } $s_pending_groups .= $s_pending_groups_opt . ""; $s_member_groups .= $s_member_groups_opt . ""; @@ -407,21 +593,26 @@ else $s_group_list_opt .= ''; } } + if($s_group_list_opt == "") { $s_group_list_opt = ""; } + else + { + $template->assign_block_vars("group_subscribe", array() ); + } $s_group_list .= $s_group_list_opt . ""; $template->assign_vars(array( "L_GROUP_MEMBERSHIP_DETAILS" => $lang['Group_member_details'], "L_JOIN_A_GROUP" => $lang['Group_member_join'], - "L_YOU_BELONG_GROUPS" => $lang['Current_memberships'], - "L_SELECT_A_GROUP" => $lang['Non_member_groups'], - "L_PENDING_GROUPS" => $lang['Memberships_pending'], - "L_SUBSCRIBE" => $lang['Subscribe'], - "L_UNSUBSCRIBE" => $lang['Unsubscribe'], - "L_VIEW_INFORMATION" => $lang['View_Information'], + "L_YOU_BELONG_GROUPS" => $lang['Current_memberships'], + "L_SELECT_A_GROUP" => $lang['Non_member_groups'], + "L_PENDING_GROUPS" => $lang['Memberships_pending'], + "L_SUBSCRIBE" => $lang['Subscribe'], + "L_UNSUBSCRIBE" => $lang['Unsubscribe'], + "L_VIEW_INFORMATION" => $lang['View_Information'], "GROUP_LIST_SELECT" => $s_group_list, "GROUP_PENDING_SELECT" => $s_pending_groups, @@ -429,6 +620,7 @@ else ); $template->pparse("user"); + } // @@ -436,4 +628,4 @@ else // include($phpbb_root_path . 'includes/page_tail.'.$phpEx); -?> \ No newline at end of file +?> diff --git a/phpBB/language/email/group_request_english.tpl b/phpBB/language/email/group_request_english.tpl new file mode 100755 index 0000000000..f7fe666a12 --- /dev/null +++ b/phpBB/language/email/group_request_english.tpl @@ -0,0 +1,8 @@ +Dear {GROUP_MODERATOR}, + +A user has requested to join a group you moderator on {SITENAME}. +To approve to deny this request for group membership please visit the following link: + +{U_GROUPCP} + +{EMAIL_SIG} diff --git a/phpBB/language/lang_english.php b/phpBB/language/lang_english.php index a5f2b813f8..3e575ba1b1 100755 --- a/phpBB/language/lang_english.php +++ b/phpBB/language/lang_english.php @@ -453,8 +453,9 @@ $lang['Descending'] = "Descending"; $lang['Order'] = "Order"; // -// Usergroups +// Group control panel // +$lang['Group_Control_Panel'] = "Group Control Panel"; $lang['Group_member_details'] = "Group Membership Details"; $lang['Group_member_join'] = "Join a Group"; @@ -470,6 +471,12 @@ $lang['Memberships_pending'] = "Memberships pending"; $lang['Join_group'] = "Join Group"; $lang['No_group_members'] = "This group has no members"; +$lang["Group_joined"] = "You have successfully subscribed to this group, you will be notifed when your subscription is approved by the group moderator."; +$lang['Group_request'] = "A request to join your group has been made"; + +$lang['Approve_selected'] = "Approve Selected"; +$lang['Deny_selected'] = "Deny Selected"; + $lang['This_open_group'] = "This is an open group, click to request membership"; $lang['This_closed_group'] = "This is a closed group, no more users accepted"; $lang['Member_this_group'] = "You are a member of this group"; @@ -481,7 +488,7 @@ $lang['Unsubscribe'] = "Unsubscribe"; $lang['View_Information'] = "View Information"; // -// Search <= Should be blank for now +// Search // $lang['Search_for_any'] = "Search for any terms or use query as entered"; $lang['Search_for_all'] = "Search for all terms"; @@ -586,6 +593,8 @@ $lang['Topic_split'] = "The selected topic has been split successfully"; $lang['Too_many_error'] = "You have selected too many posts. You can only select one post to split a topic after!"; $lang['New_forum'] = "New forum"; + + // // Timezones ... for display on each page // diff --git a/phpBB/templates/PSO/groupcp_info_body.tpl b/phpBB/templates/PSO/groupcp_info_body.tpl index 794fdae48f..f020781e83 100644 --- a/phpBB/templates/PSO/groupcp_info_body.tpl +++ b/phpBB/templates/PSO/groupcp_info_body.tpl @@ -8,7 +8,7 @@
- + @@ -27,3 +27,100 @@
{L_GROUP_INFORMATION}{L_GROUP_INFORMATION}
{L_GROUP_NAME}:

+ + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Group Moderator
 {L_USERNAME} + {L_EMAIL} + {L_FROM} + {L_POSTS} + {L_WEBSITE} +
{MOD_PM_IMG} {MOD_USERNAME} {MOD_EMAIL_IMG} {MOD_FROM}{MOD_POSTS} {MOD_WWW_IMG}
Group Members
 {L_USERNAME} + {L_EMAIL} + {L_FROM} + {L_POSTS} + {L_WEBSITE} +
{memberrow.PM_IMG} {memberrow.USERNAME} {memberrow.EMAIL_IMG} {memberrow.FROM}{memberrow.POSTS} {memberrow.WWW_IMG}
Pending Members
{L_PM}{L_USERNAME} + {L_EMAIL} + {L_FROM} + {L_POSTS} + {L_SELECT} +
{pendingmembersrow.PM_IMG} {pendingmembersrow.USERNAME} {pendingmembersrow.EMAIL_IMG} {pendingmembersrow.FROM}{pendingmembersrow.POSTS} {pendingmembersrow.SELECT} {L_SELECT}
 
{L_NO_MEMBERS}
+ + + +
 
+
+ + + + + +
{S_TIMEZONE}{JUMPBOX}
diff --git a/phpBB/templates/PSO/groupcp_list_body.tpl b/phpBB/templates/PSO/groupcp_list_body.tpl index 897c5a219e..b36f2dc5a9 100644 --- a/phpBB/templates/PSO/groupcp_list_body.tpl +++ b/phpBB/templates/PSO/groupcp_list_body.tpl @@ -6,22 +6,20 @@ Group Moderator - {L_PM} +   {L_USERNAME} - {L_EMAIL} + {L_EMAIL} {L_FROM} - {L_JOINED} {L_POSTS} - {L_WEBSITE} + {L_WEBSITE} -  {MOD_PM_IMG}  + {MOD_PM_IMG} {MOD_USERNAME} -  {MOD_EMAIL_IMG}  + {MOD_EMAIL_IMG} {MOD_FROM} - {MOD_JOINED} {MOD_POSTS} -  {MOD_WWW_IMG}  + {MOD_WWW_IMG} Group Members @@ -31,26 +29,24 @@ {L_USERNAME} {L_EMAIL} {L_FROM} - {L_JOINED} {L_POSTS} {L_WEBSITE} -  {memberrow.PM_IMG}  - {memberrow.USERNAME} -  {memberrow.EMAIL_IMG}  - {memberrow.FROM} - {memberrow.JOINED} - {memberrow.POSTS} -  {memberrow.WWW_IMG}  + {memberrow.PM_IMG} + {memberrow.USERNAME} + {memberrow.EMAIL_IMG} + {memberrow.FROM} + {memberrow.POSTS} + {memberrow.WWW_IMG} - - +
 {L_PAGE} {ON_PAGE} {L_OF} {TOTAL_PAGES}{PAGINATION}  
diff --git a/phpBB/templates/PSO/groupcp_user_body.tpl b/phpBB/templates/PSO/groupcp_user_body.tpl index eaca001104..8f33805823 100644 --- a/phpBB/templates/PSO/groupcp_user_body.tpl +++ b/phpBB/templates/PSO/groupcp_user_body.tpl @@ -7,9 +7,11 @@
+
+ - + + + + + + + - + @@ -39,10 +46,13 @@ - +
{L_GROUP_MEMBERSHIP_DETAILS}{L_GROUP_MEMBERSHIP_DETAILS}
{L_YOU_BELONG_GROUPS} @@ -20,6 +22,8 @@
{L_PENDING_GROUPS} @@ -30,8 +34,11 @@
{L_JOIN_A_GROUP}{L_JOIN_A_GROUP}
{L_SELECT_A_GROUP}
 {GROUP_LIST_SELECT}       
+ +