Menu
▾
▴
[Phpbb-checkins] CVS: phpBB2/admin admin_groups.php,1.15,1.16
|
From: Paul S. O. <ps...@us...> - 2001-11-21 16:20:43
|
Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv22988/admin
Modified Files:
admin_groups.php
Log Message:
Minor change to use username selector
Index: admin_groups.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_groups.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** admin_groups.php 2001/11/21 03:10:09 1.15
--- admin_groups.php 2001/11/21 16:20:40 1.16
***************
*** 33,37 ****
//
$phpbb_root_dir = "./../";
! $no_page_header = TRUE;
require('pagestart.inc');
--- 33,37 ----
//
$phpbb_root_dir = "./../";
!
require('pagestart.inc');
***************
*** 50,55 ****
// Ok they are editing a group or creating a new group
//
- include('page_header_admin.' . $phpEx);
-
$template->set_filenames(array(
"body" => "admin/group_edit_body.tpl")
--- 50,53 ----
***************
*** 69,76 ****
--- 67,76 ----
message_die(GENERAL_ERROR, "Error getting group information", "", __LINE__, __FILE__, $sql);
}
+
if( !$db->sql_numrows($result) )
{
message_die(GENERAL_MESSAGE, $lang['Group_not_exist']);
}
+
$group_info = $db->sql_fetchrow($result);
***************
*** 106,116 ****
$user_list = $db->sql_fetchrowset($u_result);
- $select_list = "<select name=\"group_moderator\">";
for($i = 0; $i < count($user_list); $i++)
{
! $selected = ( $user_list[$i]['user_id'] == $group_info['group_moderator'] ) ? "selected=\"selected\"" : "";
! $select_list .= "<option value=\"" . $user_list[$i]['user_id'] . "\"$selected>" . $user_list[$i]['username'] . "</option>";
}
- $select_list .= "</select>";
$group_open = ( $group_info['group_type'] == GROUP_OPEN ) ? "checked=\"checked\"" : "";
--- 106,116 ----
$user_list = $db->sql_fetchrowset($u_result);
for($i = 0; $i < count($user_list); $i++)
{
! if( $user_list[$i]['user_id'] == $group_info['group_moderator'] )
! {
! $group_moderator = $user_list[$i]['username'];
! }
}
$group_open = ( $group_info['group_type'] == GROUP_OPEN ) ? "checked=\"checked\"" : "";
***************
*** 118,128 ****
$group_hidden = ( $group_info['group_type'] == GROUP_HIDDEN ) ? "checked=\"checked\"" : "";
-
-
$s_hidden_fields = '<input type="hidden" name="mode" value="' . $mode . '" /><input type="hidden" name="' . POST_GROUPS_URL . '" value="' . $group_id . '" />';
$template->assign_vars(array(
"GROUP_NAME" => $group_info['group_name'],
! "GROUP_DESCRIPTION" => $group_info['group_description'],
"L_GROUP_TITLE" => $lang['Group_administration'],
--- 118,127 ----
$group_hidden = ( $group_info['group_type'] == GROUP_HIDDEN ) ? "checked=\"checked\"" : "";
$s_hidden_fields = '<input type="hidden" name="mode" value="' . $mode . '" /><input type="hidden" name="' . POST_GROUPS_URL . '" value="' . $group_id . '" />';
$template->assign_vars(array(
"GROUP_NAME" => $group_info['group_name'],
! "GROUP_DESCRIPTION" => $group_info['group_description'],
! "GROUP_MODERATOR" => $group_moderator,
"L_GROUP_TITLE" => $lang['Group_administration'],
***************
*** 130,134 ****
"L_GROUP_NAME" => $lang['group_name'],
"L_GROUP_DESCRIPTION" => $lang['group_description'],
! "L_GROUP_MODERATOR" => $lang['group_moderator'],
"L_GROUP_STATUS" => $lang['group_status'],
"L_GROUP_OPEN" => $lang['group_open'],
--- 129,134 ----
"L_GROUP_NAME" => $lang['group_name'],
"L_GROUP_DESCRIPTION" => $lang['group_description'],
! "L_GROUP_MODERATOR" => $lang['group_moderator'],
! "L_FIND_USERNAME" => $lang['Find_username'],
"L_GROUP_STATUS" => $lang['group_status'],
"L_GROUP_OPEN" => $lang['group_open'],
***************
*** 143,147 ****
"L_YES" => $lang['Yes'],
! "S_SELECT_MODERATORS" => $select_list,
"S_GROUP_OPEN_TYPE" => GROUP_OPEN,
"S_GROUP_CLOSED_TYPE" => GROUP_CLOSED,
--- 143,148 ----
"L_YES" => $lang['Yes'],
! "U_SEARCH_USER" => append_sid("../search.$phpEx?mode=searchuser"),
!
"S_GROUP_OPEN_TYPE" => GROUP_OPEN,
"S_GROUP_CLOSED_TYPE" => GROUP_CLOSED,
***************
*** 170,182 ****
message_die(GENERAL_ERROR, "Couldn't update group", "", __LINE__, __FILE__, $sql);
}
! message_die(GENERAL_MESSAGE, $lang['Deleted_group']);
}
else
{
! $group_type = isset($HTTP_POST_VARS['group_type']) ? trim($HTTP_POST_VARS['group_type']) : "";
$group_name = isset($HTTP_POST_VARS['group_name']) ? trim($HTTP_POST_VARS['group_name']) : "";
$group_description = isset($HTTP_POST_VARS['group_description']) ? trim($HTTP_POST_VARS['group_description']) : "";
! $group_moderator = isset($HTTP_POST_VARS['group_moderator']) ? intval($HTTP_POST_VARS['group_moderator']) : "";
$delete_old_moderator = isset($HTTP_POST_VARS['delete_old_moderator']) ? intval($HTTP_POST_VARS['delete_old_moderator']) : "";
--- 171,185 ----
message_die(GENERAL_ERROR, "Couldn't update group", "", __LINE__, __FILE__, $sql);
}
+
+ $message = $lang['Deleted_group'] . "<br /><br />" . sprintf($lang['return_group_admin'], "<a href=\"" . append_sid("admin_groups.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");;
! message_die(GENERAL_MESSAGE, $message);
}
else
{
! $group_type = isset($HTTP_POST_VARS['group_type']) ? intval($HTTP_POST_VARS['group_type']) : GROUP_OPEN;
$group_name = isset($HTTP_POST_VARS['group_name']) ? trim($HTTP_POST_VARS['group_name']) : "";
$group_description = isset($HTTP_POST_VARS['group_description']) ? trim($HTTP_POST_VARS['group_description']) : "";
! $group_moderator = isset($HTTP_POST_VARS['username']) ? $HTTP_POST_VARS['username'] : "";
$delete_old_moderator = isset($HTTP_POST_VARS['delete_old_moderator']) ? intval($HTTP_POST_VARS['delete_old_moderator']) : "";
***************
*** 189,197 ****
message_die(GENERAL_MESSAGE, $lang['No_group_moderator']);
}
! else if( $group_type == "" )
{
! message_die(GENERAL_MESSAGE, $lang['No_group_mode']);
}
!
if( $mode == "editgroup" )
{
--- 192,204 ----
message_die(GENERAL_MESSAGE, $lang['No_group_moderator']);
}
!
! $this_userdata = get_userdata($group_moderator);
! $group_moderator = $this_userdata['user_id'];
!
! if( !$group_moderator )
{
! message_die(GENERAL_MESSAGE, $lang['No_group_moderator']);
}
!
if( $mode == "editgroup" )
{
***************
*** 235,245 ****
message_die(GENERAL_ERROR, "Couldn't update group", "", __LINE__, __FILE__, $sql);
}
-
- $template->assign_vars(array(
- "META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("admin_groups.$phpEx") . '">')
- );
! $message = $lang['Updated_group'];
! $message .= "<br />" . sprintf($lang['return_group_admin'], "<a href=\"" . append_sid("admin_groups.$phpEx") . "\">", "</a>");
message_die(GENERAL_MESSAGE, $message);
}
--- 242,248 ----
message_die(GENERAL_ERROR, "Couldn't update group", "", __LINE__, __FILE__, $sql);
}
! $message = $lang['Updated_group'] . "<br /><br />" . sprintf($lang['return_group_admin'], "<a href=\"" . append_sid("admin_groups.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");;
!
message_die(GENERAL_MESSAGE, $message);
}
***************
*** 262,272 ****
message_die(GENERAL_ERROR, "Couldn't insert new user-group info", "", __LINE__, __FILE__, $sql);
}
-
- $template->assign_vars(array(
- "META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("admin_groups.$phpEx") . '">')
- );
! $message = $lang['Added_new_group'];
! $message .= "<br />" . sprintf($lang['return_group_admin'], "<a href=\"" . append_sid("admin_groups.$phpEx") . "\">", "</a>");
message_die(GENERAL_MESSAGE, $message);
--- 265,271 ----
message_die(GENERAL_ERROR, "Couldn't insert new user-group info", "", __LINE__, __FILE__, $sql);
}
! $message = $lang['Added_new_group'] . "<br /><br />" . sprintf($lang['return_group_admin'], "<a href=\"" . append_sid("admin_groups.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");;
!
message_die(GENERAL_MESSAGE, $message);
***************
*** 280,285 ****
else
{
- include('page_header_admin.' . $phpEx);
-
$sql = "SELECT group_id, group_name
FROM " . GROUPS_TABLE . "
--- 279,282 ----
|
