mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-05 23:25:30 +02:00
Code Issues Releases Wiki Activity

- only bugfixes

Browse Source 
- use usergroup function to activate users at admin index


git-svn-id: file:///svn/phpbb/trunk@5200 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2005-08-19 10:52:06 +00:00
parent f71d1a2a00
commit bcc1eb1c0e
4 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
phpBB/adm/admin_groups.php
View File

@ -604,7 +604,7 @@ function swatch()
FROM ' . USERS_TABLE . ' u, ' . USER_GROUP_TABLE . " ug FROM ' . USERS_TABLE . ' u, ' . USER_GROUP_TABLE . " ug
WHERE ug.group_id = $group_id WHERE ug.group_id = $group_id
AND u.user_id = ug.user_id AND u.user_id = ug.user_id
ORDER BY ug.group_leader DESC, ug.user_pending DESC, u.username ORDER BY ug.group_leader DESC, ug.user_pending ASC, u.username
LIMIT $start, " . $config['topics_per_page']; LIMIT $start, " . $config['topics_per_page'];
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
@ -674,26 +674,26 @@ function swatch()
<td class="row3" colspan="5"><b><?php echo $user->lang['GROUP_APPROVED']; ?></b></td> <td class="row3" colspan="5"><b><?php echo $user->lang['GROUP_APPROVED']; ?></b></td>
</tr> </tr>
<?php <?php
if (sizeof($group_data['member'])) if (sizeof($group_data['member']))
{ {
$pending = $group_data['member'][0]['user_pending'];
$row_class = ''; $row_class = '';
$pending = false;
foreach ($group_data['member'] as $row) foreach ($group_data['member'] as $row)
{ {
if ($pending) $row_class = ($row_class == 'row1') ? 'row2' : 'row1';
{
if ($row['user_pending'] && !$pending)
{
?> ?>
<tr> <tr>
<td class="row3" colspan="5"><b><?php echo $user->lang['GROUP_PENDING']; ?></b></td> <td class="row3" colspan="5"><b><?php echo $user->lang['GROUP_PENDING']; ?></b></td>
</tr> </tr>
<?php <?php
$pending = true;
} }
$row_class = ($row_class == 'row1') ? 'row2' : 'row1';
?> ?>
<tr class="<?php echo $row_class; ?>"> <tr class="<?php echo $row_class; ?>">
<td><a href="<?php echo "admin_users.$phpEx$SID&amp;mode=edit&amp;u=" . $row['user_id']; ?>"><?php echo $row['username']; ?></a></td> <td><a href="<?php echo "admin_users.$phpEx$SID&amp;mode=edit&amp;u=" . $row['user_id']; ?>"><?php echo $row['username']; ?></a></td>

4
phpBB/adm/admin_profile.php
View File

@ -401,7 +401,7 @@ if ($mode == 'create' || $mode == 'edit')
continue; continue;
} }
$s_hidden_fields .= build_hidden_fields($key_ary); $s_hidden_fields .= build_hidden_keys($key_ary);
} }
if (!sizeof($error)) if (!sizeof($error))
@ -1294,7 +1294,7 @@ function update_insert($table, $sql_ary, $where_fields)
} }
} }
function build_hidden_fields($key_ary) function build_hidden_keys($key_ary)
{ {
$hidden_fields = ''; $hidden_fields = '';

2
phpBB/adm/admin_viewlogs.php
View File

@ -43,7 +43,7 @@ $forum_id = request_var('f', 0);
$start = request_var('start', 0); $start = request_var('start', 0);
$deletemark = (isset($_POST['delmarked'])) ? true : false; $deletemark = (isset($_POST['delmarked'])) ? true : false;
$deleteall = (isset($_POST['delall'])) ? true : false; $deleteall = (isset($_POST['delall'])) ? true : false;
$marked = request_var('mark', 0); $marked = request_var('mark', array(0));
// Sort keys // Sort keys
$sort_days = request_var('st', 0); $sort_days = request_var('st', 0);

12
phpBB/adm/index.php
View File

@ -156,8 +156,13 @@ elseif ($pane == 'right')
if ($action == 'activate') if ($action == 'activate')
{ {
$sql = 'UPDATE ' . USERS_TABLE . ' SET user_type = ' . USER_NORMAL . " WHERE user_id IN ($mark)"; include($phpbb_root_path . 'includes/functions_user.php');
$db->sql_query($sql); $mark_ary = explode(', ', $mark);
foreach ($mark_ary as $user_id)
{
user_active_flip($user_id, USER_INACTIVE);
}
} }
else if ($action == 'delete') else if ($action == 'delete')
{ {
@ -165,6 +170,8 @@ elseif ($pane == 'right')
$db->sql_query($sql); $db->sql_query($sql);
$sql = 'DELETE FROM ' . USERS_TABLE . " WHERE user_id IN ($mark)"; $sql = 'DELETE FROM ' . USERS_TABLE . " WHERE user_id IN ($mark)";
$db->sql_query($sql); $db->sql_query($sql);
add_log('admin', 'LOG_INDEX_' . strtoupper($action), implode(', ', $user_affected));
} }
if ($action != 'delete') if ($action != 'delete')
@ -172,7 +179,6 @@ elseif ($pane == 'right')
set_config('num_users', $config['num_users'] + $db->sql_affectedrows(), true); set_config('num_users', $config['num_users'] + $db->sql_affectedrows(), true);
} }
add_log('admin', 'LOG_INDEX_' . strtoupper($action), implode(', ', $user_affected));
break; break;
case 'remind': case 'remind':