diff --git a/phpBB/admin/admin_groups.php b/phpBB/admin/admin_groups.php
index 239056304a..7ee1a7cdf6 100644
--- a/phpBB/admin/admin_groups.php
+++ b/phpBB/admin/admin_groups.php
@@ -22,7 +22,7 @@
define('IN_PHPBB', 1);
-if( !empty($setmodules) )
+if ( !empty($setmodules) )
{
$filename = basename(__FILE__);
$module['Groups']['Manage'] = $filename;
@@ -33,38 +33,35 @@ if( !empty($setmodules) )
//
// Load default header
//
-$phpbb_root_path = "./../";
+$phpbb_root_path = './../';
require($phpbb_root_path . 'extension.inc');
require('./pagestart.' . $phpEx);
-if( isset($HTTP_POST_VARS[POST_GROUPS_URL]) || isset($HTTP_GET_VARS[POST_GROUPS_URL]) )
+if ( isset($HTTP_POST_VARS[POST_GROUPS_URL]) || isset($HTTP_GET_VARS[POST_GROUPS_URL]) )
{
$group_id = ( isset($HTTP_POST_VARS[POST_GROUPS_URL]) ) ? intval($HTTP_POST_VARS[POST_GROUPS_URL]) : intval($HTTP_GET_VARS[POST_GROUPS_URL]);
}
else
{
- $group_id = "";
+ $group_id = '';
}
-//
-// Mode setting
-//
-if( isset($HTTP_POST_VARS['mode']) || isset($HTTP_GET_VARS['mode']) )
+if ( isset($HTTP_POST_VARS['mode']) || isset($HTTP_GET_VARS['mode']) )
{
$mode = ( isset($HTTP_POST_VARS['mode']) ) ? $HTTP_POST_VARS['mode'] : $HTTP_GET_VARS['mode'];
}
else
{
- $mode = "";
+ $mode = '';
}
-if( isset($HTTP_POST_VARS['edit']) || isset($HTTP_POST_VARS['new']) )
+if ( isset($HTTP_POST_VARS['edit']) || isset($HTTP_POST_VARS['new']) )
{
//
// Ok they are editing a group or creating a new group
//
$template->set_filenames(array(
- "body" => "admin/group_edit_body.tpl")
+ 'body' => 'admin/group_edit_body.tpl')
);
if ( isset($HTTP_POST_VARS['edit']) )
@@ -76,34 +73,33 @@ if( isset($HTTP_POST_VARS['edit']) || isset($HTTP_POST_VARS['new']) )
FROM " . GROUPS_TABLE . "
WHERE group_single_user <> " . TRUE . "
AND group_id = $group_id";
- if(!$result = $db->sql_query($sql))
+ if ( !($result = $db->sql_query($sql)) )
{
- message_die(GENERAL_ERROR, "Error getting group information", "", __LINE__, __FILE__, $sql);
+ message_die(GENERAL_ERROR, 'Error getting group information', '', __LINE__, __FILE__, $sql);
}
- if( !$db->sql_numrows($result) )
+ if ( !($group_info = $db->sql_fetchrow($result)) )
{
message_die(GENERAL_MESSAGE, $lang['Group_not_exist']);
}
- $group_info = $db->sql_fetchrow($result);
-
- $mode = "editgroup";
- $template->assign_block_vars("group_edit", array());
+ $mode = 'editgroup';
+ $template->assign_block_vars('group_edit', array());
}
- else if( isset($HTTP_POST_VARS['new']) )
+ else if ( isset($HTTP_POST_VARS['new']) )
{
$group_info = array (
- "group_name" => "",
- "group_description" => "",
- "group_moderator" => "",
- "group_type" => GROUP_OPEN);
- $group_open = "checked=\"checked\"";
+ 'group_name' => '',
+ 'group_description' => '',
+ 'group_moderator' => '',
+ 'group_type' => GROUP_OPEN);
+ $group_open = ' checked="checked"';
- $mode = "newgroup";
+ $mode = 'newgroup';
}
+
//
// Ok, now we know everything about them, let's show the page.
//
@@ -111,111 +107,108 @@ if( isset($HTTP_POST_VARS['edit']) || isset($HTTP_POST_VARS['new']) )
FROM " . USERS_TABLE . "
WHERE user_id <> " . ANONYMOUS . "
ORDER BY username";
- $u_result = $db->sql_query($sql);
- if( !$u_result )
+ if ( !($result = $db->sql_query($sql)) )
{
- message_die(GENERAL_ERROR, "Couldn't obtain user info for moderator list", "", __LINE__, __FILE__, $sql);
+ message_die(GENERAL_ERROR, 'Could not obtain user info for moderator list', '', __LINE__, __FILE__, $sql);
}
- $user_list = $db->sql_fetchrowset($u_result);
-
- for($i = 0; $i < count($user_list); $i++)
+ while ( $row = $db->sql_fetchrow($result) )
{
- if( $user_list[$i]['user_id'] == $group_info['group_moderator'] )
+ if ( $row['user_id'] == $group_info['group_moderator'] )
{
- $group_moderator = $user_list[$i]['username'];
+ $group_moderator = $row['username'];
}
}
- $group_open = ( $group_info['group_type'] == GROUP_OPEN ) ? "checked=\"checked\"" : "";
- $group_closed = ( $group_info['group_type'] == GROUP_CLOSED ) ? "checked=\"checked\"" : "";
- $group_hidden = ( $group_info['group_type'] == GROUP_HIDDEN ) ? "checked=\"checked\"" : "";
+ $group_open = ( $group_info['group_type'] == GROUP_OPEN ) ? ' checked="checked"' : '';
+ $group_closed = ( $group_info['group_type'] == GROUP_CLOSED ) ? ' checked="checked"' : '';
+ $group_hidden = ( $group_info['group_type'] == GROUP_HIDDEN ) ? ' checked="checked"' : '';
$s_hidden_fields = '';
$template->assign_vars(array(
- "GROUP_NAME" => $group_info['group_name'],
- "GROUP_DESCRIPTION" => $group_info['group_description'],
- "GROUP_MODERATOR" => $group_moderator,
+ 'GROUP_NAME' => $group_info['group_name'],
+ 'GROUP_DESCRIPTION' => $group_info['group_description'],
+ 'GROUP_MODERATOR' => $group_moderator,
- "L_GROUP_TITLE" => $lang['Group_administration'],
- "L_GROUP_EDIT_DELETE" => ( isset($HTTP_POST_VARS['new']) ) ? $lang['New_group'] : $lang['Edit_group'],
- "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'],
- "L_GROUP_CLOSED" => $lang['group_closed'],
- "L_GROUP_HIDDEN" => $lang['group_hidden'],
- "L_GROUP_DELETE" => $lang['group_delete'],
- "L_GROUP_DELETE_CHECK" => $lang['group_delete_check'],
- "L_SUBMIT" => $lang['Submit'],
- "L_RESET" => $lang['Reset'],
- "L_DELETE_MODERATOR" => $lang['delete_group_moderator'],
- "L_DELETE_MODERATOR_EXPLAIN" => $lang['delete_moderator_explain'],
- "L_YES" => $lang['Yes'],
+ 'L_GROUP_TITLE' => $lang['Group_administration'],
+ 'L_GROUP_EDIT_DELETE' => ( isset($HTTP_POST_VARS['new']) ) ? $lang['New_group'] : $lang['Edit_group'],
+ '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'],
+ 'L_GROUP_CLOSED' => $lang['group_closed'],
+ 'L_GROUP_HIDDEN' => $lang['group_hidden'],
+ 'L_GROUP_DELETE' => $lang['group_delete'],
+ 'L_GROUP_DELETE_CHECK' => $lang['group_delete_check'],
+ 'L_SUBMIT' => $lang['Submit'],
+ 'L_RESET' => $lang['Reset'],
+ 'L_DELETE_MODERATOR' => $lang['delete_group_moderator'],
+ 'L_DELETE_MODERATOR_EXPLAIN' => $lang['delete_moderator_explain'],
+ 'L_YES' => $lang['Yes'],
- "U_SEARCH_USER" => append_sid("../search.$phpEx?mode=searchuser"),
+ 'U_SEARCH_USER' => append_sid("../search.$phpEx?mode=searchuser"),
- "S_GROUP_OPEN_TYPE" => GROUP_OPEN,
- "S_GROUP_CLOSED_TYPE" => GROUP_CLOSED,
- "S_GROUP_HIDDEN_TYPE" => GROUP_HIDDEN,
- "S_GROUP_OPEN_CHECKED" => $group_open,
- "S_GROUP_CLOSED_CHECKED" => $group_closed,
- "S_GROUP_HIDDEN_CHECKED" => $group_hidden,
- "S_GROUP_ACTION" => append_sid("admin_groups.$phpEx"),
- "S_HIDDEN_FIELDS" => $s_hidden_fields)
+ 'S_GROUP_OPEN_TYPE' => GROUP_OPEN,
+ 'S_GROUP_CLOSED_TYPE' => GROUP_CLOSED,
+ 'S_GROUP_HIDDEN_TYPE' => GROUP_HIDDEN,
+ 'S_GROUP_OPEN_CHECKED' => $group_open,
+ 'S_GROUP_CLOSED_CHECKED' => $group_closed,
+ 'S_GROUP_HIDDEN_CHECKED' => $group_hidden,
+ 'S_GROUP_ACTION' => append_sid("admin_groups.$phpEx"),
+ 'S_HIDDEN_FIELDS' => $s_hidden_fields)
);
$template->pparse('body');
}
-else if( isset($HTTP_POST_VARS['group_update']) )
+else if ( isset($HTTP_POST_VARS['group_update']) )
{
//
// Ok, they are submitting a group, let's save the data based on if it's new or editing
//
- if( isset($HTTP_POST_VARS['group_delete']) )
+ if ( isset($HTTP_POST_VARS['group_delete']) )
{
$sql = "DELETE FROM " . GROUPS_TABLE . "
WHERE group_id = " . $group_id;
- if ( !$result = $db->sql_query($sql) )
+ if ( !$db->sql_query($sql) )
{
- message_die(GENERAL_ERROR, "Couldn't update group", "", __LINE__, __FILE__, $sql);
+ message_die(GENERAL_ERROR, 'Could not update group', '', __LINE__, __FILE__, $sql);
}
$sql = "DELETE FROM " . USER_GROUP_TABLE . "
WHERE group_id = " . $group_id;
- if ( !$result = $db->sql_query($sql) )
+ if ( !$db->sql_query($sql) )
{
- message_die(GENERAL_ERROR, "Couldn't update user_group", "", __LINE__, __FILE__, $sql);
+ message_die(GENERAL_ERROR, 'Could not update user_group', '', __LINE__, __FILE__, $sql);
}
$sql = "DELETE FROM " . AUTH_ACCESS_TABLE . "
WHERE group_id = " . $group_id;
- if ( !$result = $db->sql_query($sql) )
+ if ( !$db->sql_query($sql) )
{
- message_die(GENERAL_ERROR, "Couldn't update auth_access", "", __LINE__, __FILE__, $sql);
+ message_die(GENERAL_ERROR, 'Could not update auth_access', '', __LINE__, __FILE__, $sql);
}
- $message = $lang['Deleted_group'] . "
" . sprintf($lang['Click_return_groupsadmin'], "", "") . "
" . sprintf($lang['Click_return_admin_index'], "", "");;
+ $message = $lang['Deleted_group'] . '
' . sprintf($lang['Click_return_groupsadmin'], '', '') . '
' . sprintf($lang['Click_return_admin_index'], '', '');
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']) : "";
+ $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']) ? true : false;
- if( $group_name == "" )
+ if ( $group_name == '' )
{
message_die(GENERAL_MESSAGE, $lang['No_group_name']);
}
- else if( $group_moderator == "" )
+ else if ( $group_moderator == '' )
{
message_die(GENERAL_MESSAGE, $lang['No_group_moderator']);
}
@@ -223,7 +216,7 @@ else if( isset($HTTP_POST_VARS['group_update']) )
$this_userdata = get_userdata($group_moderator);
$group_moderator = $this_userdata['user_id'];
- if( !$group_moderator )
+ if ( !$group_moderator )
{
message_die(GENERAL_MESSAGE, $lang['No_group_moderator']);
}
@@ -234,54 +227,68 @@ else if( isset($HTTP_POST_VARS['group_update']) )
FROM " . GROUPS_TABLE . "
WHERE group_single_user <> " . TRUE . "
AND group_id = " . $group_id;
- if(!$result = $db->sql_query($sql))
+ if ( !($result = $db->sql_query($sql)) )
{
- message_die(GENERAL_ERROR, "Error getting group information", "", __LINE__, __FILE__, $sql);
+ message_die(GENERAL_ERROR, 'Error getting group information', '', __LINE__, __FILE__, $sql);
}
- if( !$db->sql_numrows($result) )
+
+ if( !($group_info = $db->sql_fetchrow($result)) )
{
message_die(GENERAL_MESSAGE, $lang['Group_not_exist']);
}
- $group_info = $db->sql_fetchrow($result);
if ( $group_info['group_moderator'] != $group_moderator )
{
- if ( $delete_old_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) )
+ if ( !$db->sql_query($sql) )
{
- message_die(GENERAL_ERROR, "Couldn't update group moderator", "", __LINE__, __FILE__, $sql);
+ message_die(GENERAL_ERROR, 'Could not 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) )
+
+ $sql = "SELECT user_id
+ FROM " . USER_GROUP_TABLE . "
+ WHERE user_id = $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);
+ message_die(GENERAL_ERROR, 'Failed to obtain current group moderator info', '', __LINE__, __FILE__, $sql);
+ }
+
+ if ( !($row = $db->sql_fetchrow($result)) )
+ {
+ $sql = "INSERT INTO " . USER_GROUP_TABLE . " (group_id, user_id, user_pending)
+ VALUES (" . $group_id . ", " . $group_moderator . ", 0)";
+ if ( !$db->sql_query($sql) )
+ {
+ message_die(GENERAL_ERROR, 'Could not update group moderator', '', __LINE__, __FILE__, $sql);
+ }
}
}
+
$sql = "UPDATE " . GROUPS_TABLE . "
SET group_type = $group_type, group_name = '" . str_replace("\'", "''", $group_name) . "', group_description = '" . str_replace("\'", "''", $group_description) . "', group_moderator = $group_moderator
WHERE group_id = $group_id";
- if ( !$result = $db->sql_query($sql) )
+ if ( !$db->sql_query($sql) )
{
- message_die(GENERAL_ERROR, "Couldn't update group", "", __LINE__, __FILE__, $sql);
+ message_die(GENERAL_ERROR, 'Could not update group', '', __LINE__, __FILE__, $sql);
}
- $message = $lang['Updated_group'] . "
" . sprintf($lang['Click_return_groupsadmin'], "", "") . "
" . sprintf($lang['Click_return_admin_index'], "", "");;
+ $message = $lang['Updated_group'] . '
' . sprintf($lang['Click_return_groupsadmin'], '', '') . '
' . sprintf($lang['Click_return_admin_index'], '', '');;
message_die(GENERAL_MESSAGE, $message);
}
- else if( $mode == "newgroup" )
+ else if( $mode == 'newgroup' )
{
$sql = "SELECT MAX(group_id) AS new_group_id
FROM " . GROUPS_TABLE;
- if ( !$result = $db->sql_query($sql) )
+ if ( !($result = $db->sql_query($sql)) )
{
- message_die(GENERAL_ERROR, "Couldn't insert new group", "", __LINE__, __FILE__, $sql);
+ message_die(GENERAL_ERROR, 'Could not insert new group', '', __LINE__, __FILE__, $sql);
}
$row = $db->sql_fetchrow($result);
@@ -289,19 +296,19 @@ else if( isset($HTTP_POST_VARS['group_update']) )
$sql = "INSERT INTO " . GROUPS_TABLE . " (group_id, group_type, group_name, group_description, group_moderator, group_single_user)
VALUES ($new_group_id, $group_type, '" . str_replace("\'", "''", $group_name) . "', '" . str_replace("\'", "''", $group_description) . "', $group_moderator, '0')";
- if ( !$result = $db->sql_query($sql) )
+ if ( !$db->sql_query($sql) )
{
- message_die(GENERAL_ERROR, "Couldn't insert new group", "", __LINE__, __FILE__, $sql);
+ message_die(GENERAL_ERROR, 'Could not insert new group', '', __LINE__, __FILE__, $sql);
}
$sql = "INSERT INTO " . USER_GROUP_TABLE . " (group_id, user_id, user_pending)
VALUES ($new_group_id, $group_moderator, 0)";
- if ( !$result = $db->sql_query($sql) )
+ if ( !$db->sql_query($sql) )
{
- message_die(GENERAL_ERROR, "Couldn't insert new user-group info", "", __LINE__, __FILE__, $sql);
+ message_die(GENERAL_ERROR, 'Could not insert new user-group info', '', __LINE__, __FILE__, $sql);
}
- $message = $lang['Added_new_group'] . "
" . sprintf($lang['Click_return_groupsadmin'], "", "") . "
" . sprintf($lang['Click_return_admin_index'], "", "");;
+ $message = $lang['Added_new_group'] . '
' . sprintf($lang['Click_return_groupsadmin'], '', '') . '
' . sprintf($lang['Click_return_admin_index'], '', '');;
message_die(GENERAL_MESSAGE, $message);
@@ -318,37 +325,41 @@ else
FROM " . GROUPS_TABLE . "
WHERE group_single_user <> " . TRUE . "
ORDER BY group_name";
- $g_result = $db->sql_query($sql);
- $group_list = $db->sql_fetchrowset($g_result);
-
- $select_list = "";
$template->set_filenames(array(
- "body" => "admin/group_select_body.tpl")
+ 'body' => 'admin/group_select_body.tpl')
);
$template->assign_vars(array(
- "L_GROUP_TITLE" => $lang['Group_administration'],
- "L_GROUP_EXPLAIN" => $lang['Group_admin_explain'],
- "L_GROUP_SELECT" => $lang['Select_group'],
- "L_LOOK_UP" => $lang['Look_up_group'],
- "L_CREATE_NEW_GROUP" => $lang['New_group'],
+ 'L_GROUP_TITLE' => $lang['Group_administration'],
+ 'L_GROUP_EXPLAIN' => $lang['Group_admin_explain'],
+ 'L_GROUP_SELECT' => $lang['Select_group'],
+ 'L_LOOK_UP' => $lang['Look_up_group'],
+ 'L_CREATE_NEW_GROUP' => $lang['New_group'],
- "S_GROUP_ACTION" => append_sid("admin_groups.$phpEx"),
- "S_GROUP_SELECT" => $select_list)
+ 'S_GROUP_ACTION' => append_sid("admin_groups.$phpEx"),
+ 'S_GROUP_SELECT' => $select_list)
);
- //
- // Faking the IF... ELSE statements again...
- //
- if( count($group_list) > 0 )
+ if ( $select_list != '' )
{
- $template->assign_block_vars("select_box", array());
+ $template->assign_block_vars('select_box', array());
}
$template->pparse('body');
@@ -356,4 +367,4 @@ else
include('./page_footer_admin.'.$phpEx);
-?>
+?>
\ No newline at end of file