1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-31 11:39:37 +02:00

Fixed various problems preventing updates of group status, etc.

git-svn-id: file:///svn/phpbb/trunk@1354 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2001-11-18 01:41:09 +00:00
parent 8da0c99f4a
commit bfa98e0e3a
2 changed files with 6 additions and 9 deletions

View File

@ -672,7 +672,6 @@ else if( $group_id )
"S_GROUP_OPEN_CHECKED" => ( $group_info['group_type'] == GROUP_OPEN ) ? "checked=\"checked\"" : "", "S_GROUP_OPEN_CHECKED" => ( $group_info['group_type'] == GROUP_OPEN ) ? "checked=\"checked\"" : "",
"S_GROUP_CLOSED_CHECKED" => ( $group_info['group_type'] == GROUP_CLOSED ) ? "checked=\"checked\"" : "", "S_GROUP_CLOSED_CHECKED" => ( $group_info['group_type'] == GROUP_CLOSED ) ? "checked=\"checked\"" : "",
"S_GROUP_HIDDEN_CHECKED" => ( $group_info['group_type'] == GROUP_HIDDEN ) ? "checked=\"checked\"" : "", "S_GROUP_HIDDEN_CHECKED" => ( $group_info['group_type'] == GROUP_HIDDEN ) ? "checked=\"checked\"" : "",
"S_GROUP_INFO_ACTION" => append_sid("groupcp.$phpEx"),
"S_HIDDEN_FIELDS" => $s_hidden_fields) "S_HIDDEN_FIELDS" => $s_hidden_fields)
); );
@ -704,7 +703,7 @@ else if( $group_id )
"S_MODE_SELECT" => $select_sort_mode, "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")) "S_GROUPCP_ACTION" => append_sid("groupcp.$phpEx?" . POST_GROUPS_URL . "=$group_id"))
); );
for($i = 0; $i < $members_count; $i++) for($i = 0; $i < $members_count; $i++)
@ -793,7 +792,7 @@ else if( $group_id )
} }
else else
{ {
if( $group_info['group_type'] != GROUP_HIDDEN || $is_group_member ) if( $group_info['group_type'] != GROUP_HIDDEN || $is_group_member || $is_moderator )
{ {
$row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2']; $row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
$row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2']; $row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
@ -841,7 +840,7 @@ else if( $group_id )
); );
} }
if( $group_info['group_type'] == GROUP_HIDDEN && !$is_group_member ) if( $group_info['group_type'] == GROUP_HIDDEN && !$is_group_member && !$is_moderator )
{ {
// //
// No group members // No group members
@ -959,9 +958,7 @@ else if( $group_id )
$template->assign_vars(array( $template->assign_vars(array(
"L_SELECT" => $lang['Select'], "L_SELECT" => $lang['Select'],
"L_APPROVE_SELECTED" => $lang['Approve_selected'], "L_APPROVE_SELECTED" => $lang['Approve_selected'],
"L_DENY_SELECTED" => $lang['Deny_selected'], "L_DENY_SELECTED" => $lang['Deny_selected'])
"S_PENDING_ACTION" => append_sid("groupcp.$phpEx?" . POST_GROUPS_URL . "=" . $group_id))
); );
$template->assign_var_from_handle("PENDING_USER_BOX", "pendinginfo"); $template->assign_var_from_handle("PENDING_USER_BOX", "pendinginfo");

View File

@ -1,5 +1,5 @@
<form method="POST" action="{S_GROUP_INFO_ACTION}"> <form method="post" action="{S_GROUPCP_ACTION}">
<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
<tr> <tr>
<td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{SITENAME}&nbsp;{L_INDEX}</a></span></td> <td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{SITENAME}&nbsp;{L_INDEX}</a></span></td>
@ -39,7 +39,7 @@
{S_HIDDEN_FIELDS} {S_HIDDEN_FIELDS}
</form> </form>
<form action="{S_PENDING_ACTION}" method="post" name="post"> <form method="post" action="{S_GROUPCP_ACTION}" name="post">
<table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline"> <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline">
<tr> <tr>
<th class="thCornerL" height="25">{L_PM}</th> <th class="thCornerL" height="25">{L_PM}</th>