aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/admin
diff options
context:
space:
mode:
authordougk_ff7 <dougk_ff7@users.sourceforge.net>2001-10-15 00:38:30 +0000
committerdougk_ff7 <dougk_ff7@users.sourceforge.net>2001-10-15 00:38:30 +0000
commit21f99ed0161c9796d0b9fbd9a999329a5b98230c (patch)
tree9d85ae98e4869c3e328e37e9b84694e6916010dd /phpBB/admin
parenta290b47ea5be2692c4cc1fa2be5cab486f70ea18 (diff)
downloadforums-21f99ed0161c9796d0b9fbd9a999329a5b98230c.tar
forums-21f99ed0161c9796d0b9fbd9a999329a5b98230c.tar.gz
forums-21f99ed0161c9796d0b9fbd9a999329a5b98230c.tar.bz2
forums-21f99ed0161c9796d0b9fbd9a999329a5b98230c.tar.xz
forums-21f99ed0161c9796d0b9fbd9a999329a5b98230c.zip
A few minor bug fixes in the group control panel.
git-svn-id: file:///svn/phpbb/trunk@1200 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/admin')
-rw-r--r--phpBB/admin/admin_groups.php47
1 files changed, 41 insertions, 6 deletions
diff --git a/phpBB/admin/admin_groups.php b/phpBB/admin/admin_groups.php
index c9f8653e53..89304ba890 100644
--- a/phpBB/admin/admin_groups.php
+++ b/phpBB/admin/admin_groups.php
@@ -132,6 +132,9 @@ if( isset($HTTP_POST_VARS['edit']) || isset($HTTP_POST_VARS['new']) )
"L_GROUP_DELETE_CHECK" => $lang['group_delete_check'],
"L_SUBMIT" => $lang['submit_group_changes'],
"L_RESET" => $lang['reset_group_changes'],
+ "L_DELETE_MODERATOR" => $lang['delete_group_moderator'],
+ "L_DELETE_MODERATOR_EXPLAIN" => $lang['delete_moderator_explain'],
+ "L_YES" => $lang['Yes'],
"S_SELECT_MODERATORS" => $select_list,
"S_GROUP_OPEN_CHECKED" => $group_open,
@@ -161,10 +164,11 @@ else if( isset($HTTP_POST_VARS['group_update']) )
}
else
{
- $group_type = isset($HTTP_POST_VARS['group_type']) ? $HTTP_POST_VARS['group_type'] : "";
- $group_name = isset($HTTP_POST_VARS['group_name']) ? $HTTP_POST_VARS['group_name'] : "";
- $group_description = isset($HTTP_POST_VARS['group_description']) ? $HTTP_POST_VARS['group_description'] : "";
+ $group_type = isset($HTTP_POST_VARS['group_type']) ? trim(addslashes($HTTP_POST_VARS['group_type'])) : "";
+ $group_name = isset($HTTP_POST_VARS['group_name']) ? trim(addslashes($HTTP_POST_VARS['group_name'])) : "";
+ $group_description = isset($HTTP_POST_VARS['group_description']) ? trim(addslashes($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']) : "";
if( $group_name == "" )
{
@@ -181,8 +185,39 @@ else if( isset($HTTP_POST_VARS['group_update']) )
if( $mode == "editgroup" )
{
-
- echo $sql = "UPDATE " . GROUPS_TABLE . "
+ $sql = "SELECT *
+ FROM " . GROUPS_TABLE . "
+ WHERE group_single_user <> " . TRUE . "
+ AND group_id = " . $group_id;
+ if(!$result = $db->sql_query($sql))
+ {
+ message_die(GENERAL_ERROR, "Error getting group information", "", __LINE__, __FILE__, $sql);
+ }
+ if( !$db->sql_numrows($result) )
+ {
+ message_die(GENERAL_MESSAGE, "That user group does not exist");
+ }
+ $group_info = $db->sql_fetchrow($result);
+
+ if ( $group_info['group_moderator'] != $group_moderator )
+ {
+ if ( $delete_old_moderator != "" )
+ {
+ $sql = "DELETE FROM " . USER_GROUP_TABLE . "
+ WHERE user_id = " . $group_info['group_moderator'] . " AND group_id = " . $group_id;
+ if ( !$result = $db->sql_query($sql) )
+ {
+ message_die(GENERAL_ERROR, "Couldn't update group moderator", "", __LINE__, __FILE__, $sql);
+ }
+ }
+ $sql = "INSERT INTO " . USER_GROUP_TABLE . " (group_id, user_id, user_pending)
+ VALUES (" . $group_id . ", " . $group_moderator . ", 0)";
+ if ( !$result = $db->sql_query($sql) )
+ {
+ message_die(GENERAL_ERROR, "Couldn't update group moderator", "", __LINE__, __FILE__, $sql);
+ }
+ }
+ $sql = "UPDATE " . GROUPS_TABLE . "
SET group_type = $group_type, group_name = '" . $group_name . "', group_description = '" . $group_description . "', group_moderator = $group_moderator
WHERE group_id = $group_id";
if ( !$result = $db->sql_query($sql) )
@@ -196,7 +231,7 @@ else if( isset($HTTP_POST_VARS['group_update']) )
{
$sql = "INSERT INTO " . GROUPS_TABLE . " (group_type, group_name, group_description, group_moderator, group_single_user)
- VALUES ($group_type, '" . $group_name . "', '" . $group_description . "', $group_moderator, '0')";
+ VALUES ('" . $group_type . "', '" . $group_name . "', '" . $group_description . "', '" . $group_moderator . "', '0')";
if ( !$result = $db->sql_query($sql) )
{
message_die(GENERAL_ERROR, "Couldn't insert new group", "", __LINE__, __FILE__, $sql);