| Zeile 54 | Zeile 54 |
|---|
if($mybb->input['action'] == "prune")
{
// User clicked no
|
if($mybb->input['action'] == "prune")
{
// User clicked no
|
if($mybb->input['no'])
| if($mybb->get_input('no'))
|
{
admin_redirect("index.php?module=user-banning");
}
| {
admin_redirect("index.php?module=user-banning");
}
|
| Zeile 62 | Zeile 62 |
|---|
$query = $db->simple_select("banned", "*", "uid='{$mybb->input['uid']}'");
$ban = $db->fetch_array($query);
|
$query = $db->simple_select("banned", "*", "uid='{$mybb->input['uid']}'");
$ban = $db->fetch_array($query);
|
if(!$ban['uid'])
| if(!$ban)
|
{
flash_message($lang->error_invalid_ban, 'error');
admin_redirect("index.php?module=user-banning");
| {
flash_message($lang->error_invalid_ban, 'error');
admin_redirect("index.php?module=user-banning");
|
| Zeile 70 | Zeile 70 |
|---|
$user = get_user($ban['uid']);
|
$user = get_user($ban['uid']);
|
if(is_super_admin($user['uid']) && ($mybb->user['uid'] != $user['uid'] && !is_super_admin($mybb->user['uid'])))
| if(!$user || (is_super_admin($user['uid']) && ($mybb->user['uid'] != $user['uid'] && !is_super_admin($mybb->user['uid']))))
|
{
flash_message($lang->cannot_perform_action_super_admin_general, 'error');
admin_redirect("index.php?module=user-banning");
| {
flash_message($lang->cannot_perform_action_super_admin_general, 'error');
admin_redirect("index.php?module=user-banning");
|
| Zeile 114 | Zeile 114 |
|---|
if($mybb->input['action'] == "lift")
{
// User clicked no
|
if($mybb->input['action'] == "lift")
{
// User clicked no
|
if($mybb->input['no'])
| if($mybb->get_input('no'))
|
{
admin_redirect("index.php?module=user-banning");
}
| {
admin_redirect("index.php?module=user-banning");
}
|
| Zeile 122 | Zeile 122 |
|---|
$query = $db->simple_select("banned", "*", "uid='{$mybb->input['uid']}'");
$ban = $db->fetch_array($query);
|
$query = $db->simple_select("banned", "*", "uid='{$mybb->input['uid']}'");
$ban = $db->fetch_array($query);
|
if(!$ban['uid'])
| if(!$ban)
|
{
flash_message($lang->error_invalid_ban, 'error');
admin_redirect("index.php?module=user-banning");
| {
flash_message($lang->error_invalid_ban, 'error');
admin_redirect("index.php?module=user-banning");
|
| Zeile 130 | Zeile 130 |
|---|
$user = get_user($ban['uid']);
|
$user = get_user($ban['uid']);
|
if(is_super_admin($user['uid']) && ($mybb->user['uid'] != $user['uid'] && !is_super_admin($mybb->user['uid'])))
| if(!$user || (is_super_admin($user['uid']) && ($mybb->user['uid'] != $user['uid'] && !is_super_admin($mybb->user['uid']))))
|
{
flash_message($lang->cannot_perform_action_super_admin_general, 'error');
admin_redirect("index.php?module=user-banning");
| {
flash_message($lang->cannot_perform_action_super_admin_general, 'error');
admin_redirect("index.php?module=user-banning");
|
| Zeile 142 | Zeile 142 |
|---|
{
$updated_group = array(
'usergroup' => $ban['oldgroup'],
|
{
$updated_group = array(
'usergroup' => $ban['oldgroup'],
|
'additionalgroups' => $ban['oldadditionalgroups'],
| 'additionalgroups' => $db->escape_string($ban['oldadditionalgroups']),
|
'displaygroup' => $ban['olddisplaygroup']
);
$db->delete_query("banned", "uid='{$ban['uid']}'");
| 'displaygroup' => $ban['olddisplaygroup']
);
$db->delete_query("banned", "uid='{$ban['uid']}'");
|
| Zeile 151 | Zeile 151 |
|---|
$db->update_query("users", $updated_group, "uid='{$ban['uid']}'");
|
$db->update_query("users", $updated_group, "uid='{$ban['uid']}'");
|
$cache->update_banned();
| |
$cache->update_moderators();
// Log admin action
| $cache->update_moderators();
// Log admin action
|
| Zeile 171 | Zeile 170 |
|---|
$query = $db->simple_select("banned", "*", "uid='{$mybb->input['uid']}'");
$ban = $db->fetch_array($query);
|
$query = $db->simple_select("banned", "*", "uid='{$mybb->input['uid']}'");
$ban = $db->fetch_array($query);
|
$user = get_user($ban['uid']);
if(!$ban['uid'])
| if(!$ban)
|
{
flash_message($lang->error_invalid_ban, 'error');
admin_redirect("index.php?module=user-banning");
}
|
{
flash_message($lang->error_invalid_ban, 'error');
admin_redirect("index.php?module=user-banning");
}
|
| |
$user = get_user($ban['uid']);
|
$plugins->run_hooks("admin_user_banning_edit");
if($mybb->request_method == "post")
{
|
$plugins->run_hooks("admin_user_banning_edit");
if($mybb->request_method == "post")
{
|
if(!$ban['uid'])
{
| if(empty($ban['uid']))
{
|
$errors[] = $lang->error_invalid_username;
}
// Is the user we're trying to ban a super admin and we're not?
else if(is_super_admin($ban['uid']) && !is_super_admin($ban['uid']))
{
$errors[] = $lang->error_no_perm_to_ban;
|
$errors[] = $lang->error_invalid_username;
}
// Is the user we're trying to ban a super admin and we're not?
else if(is_super_admin($ban['uid']) && !is_super_admin($ban['uid']))
{
$errors[] = $lang->error_no_perm_to_ban;
|
}
| }
|
if($ban['uid'] == $mybb->user['uid'])
{
$errors[] = $lang->error_ban_self;
| if($ban['uid'] == $mybb->user['uid'])
{
$errors[] = $lang->error_ban_self;
|
| Zeile 205 | Zeile 204 |
|---|
if($mybb->input['bantime'] == '---')
{
$lifted = 0;
|
if($mybb->input['bantime'] == '---')
{
$lifted = 0;
|
}
else
{
| }
else
{
|
$lifted = ban_date2timestamp($mybb->input['bantime'], $ban['dateline']);
|
$lifted = ban_date2timestamp($mybb->input['bantime'], $ban['dateline']);
|
}
$reason = my_substr($mybb->input['reason'], 0, 255);
| }
$reason = my_substr($mybb->input['reason'], 0, 255);
|
if(count($banned_groups) == 1)
{
$group = array_keys($banned_groups);
| if(count($banned_groups) == 1)
{
$group = array_keys($banned_groups);
|
| Zeile 225 | Zeile 224 |
|---|
'bantime' => $db->escape_string($mybb->input['bantime']),
'lifted' => $db->escape_string($lifted),
'reason' => $db->escape_string($reason)
|
'bantime' => $db->escape_string($mybb->input['bantime']),
'lifted' => $db->escape_string($lifted),
'reason' => $db->escape_string($reason)
|
);
| );
|
$db->update_query('banned', $update_array, "uid='{$ban['uid']}'");
|
$db->update_query('banned', $update_array, "uid='{$ban['uid']}'");
|
| Zeile 238 | Zeile 237 |
|---|
$db->update_query('users', $update_array, "uid = {$ban['uid']}");
$plugins->run_hooks("admin_user_banning_edit_commit");
|
$db->update_query('users', $update_array, "uid = {$ban['uid']}");
$plugins->run_hooks("admin_user_banning_edit_commit");
|
$cache->update_banned();
| |
// Log admin action
log_admin_action($ban['uid'], $user['username']);
|
// Log admin action
log_admin_action($ban['uid'], $user['username']);
|
|
|
flash_message($lang->success_ban_updated, 'success');
admin_redirect("index.php?module=user-banning");
}
| flash_message($lang->success_ban_updated, 'success');
admin_redirect("index.php?module=user-banning");
}
|
| Zeile 257 | Zeile 254 |
|---|
'description' => $lang->edit_ban_desc
);
$page->output_nav_tabs($sub_tabs, "edit");
|
'description' => $lang->edit_ban_desc
);
$page->output_nav_tabs($sub_tabs, "edit");
|
|
|
$form = new Form("index.php?module=user-banning&action=edit&uid={$ban['uid']}", "post");
if($errors)
|
$form = new Form("index.php?module=user-banning&action=edit&uid={$ban['uid']}", "post");
if($errors)
|
{
| {
|
$page->output_inline_error($errors);
}
else
{
|
$page->output_inline_error($errors);
}
else
{
|
$mybb->input = array_merge($mybb->input, $ban);
| $mybb->input = array_merge($mybb->input, $ban);
}
if(!empty($ban['gid']))
{
$mybb->input['usergroup'] = $ban['gid'];
}
else if(!empty($user['usergroup']))
{
$mybb->input['usergroup'] = $user['usergroup'];
}
else
{
$mybb->input['usergroup'] = 0;
|
}
$form_container = new FormContainer($lang->edit_ban);
| }
$form_container = new FormContainer($lang->edit_ban);
|
| Zeile 317 | Zeile 327 |
|---|
$user = get_user_by_username($mybb->input['username'], $options);
// Are we searching a user?
|
$user = get_user_by_username($mybb->input['username'], $options);
// Are we searching a user?
|
if(isset($mybb->input['search']))
| if(is_array($user) && isset($mybb->input['search']))
|
{
$where_sql = 'uid=\''.(int)$user['uid'].'\'';
$where_sql_full = 'WHERE b.uid=\''.(int)$user['uid'].'\'';
}
else
{
|
{
$where_sql = 'uid=\''.(int)$user['uid'].'\'';
$where_sql_full = 'WHERE b.uid=\''.(int)$user['uid'].'\'';
}
else
{
|
if(!$user['uid'])
| if(!$user)
|
{
$errors[] = $lang->error_invalid_username;
}
| {
$errors[] = $lang->error_invalid_username;
}
|
| Zeile 346 | Zeile 356 |
|---|
if(!empty($usergroups[$user['usergroup']]) && $usergroups[$user['usergroup']]['isbannedgroup'] == 1)
{
$errors[] = $lang->error_already_banned;
|
if(!empty($usergroups[$user['usergroup']]) && $usergroups[$user['usergroup']]['isbannedgroup'] == 1)
{
$errors[] = $lang->error_already_banned;
|
}
}
if($user['uid'] == $mybb->user['uid'])
{
$errors[] = $lang->error_ban_self;
| }
if($user['uid'] == $mybb->user['uid'])
{
$errors[] = $lang->error_ban_self;
}
|
}
// No errors? Insert
| }
// No errors? Insert
|
| Zeile 379 | Zeile 389 |
|---|
'uid' => $user['uid'],
'gid' => $mybb->get_input('usergroup', MyBB::INPUT_INT),
'oldgroup' => $user['usergroup'],
|
'uid' => $user['uid'],
'gid' => $mybb->get_input('usergroup', MyBB::INPUT_INT),
'oldgroup' => $user['usergroup'],
|
'oldadditionalgroups' => $user['additionalgroups'],
| 'oldadditionalgroups' => $db->escape_string($user['additionalgroups']),
|
'olddisplaygroup' => $user['displaygroup'],
'admin' => (int)$mybb->user['uid'],
'dateline' => TIME_NOW,
| 'olddisplaygroup' => $user['displaygroup'],
'admin' => (int)$mybb->user['uid'],
'dateline' => TIME_NOW,
|
| Zeile 402 | Zeile 412 |
|---|
$plugins->run_hooks("admin_user_banning_start_commit");
$db->update_query('users', $update_array, "uid = '{$user['uid']}'");
|
$plugins->run_hooks("admin_user_banning_start_commit");
$db->update_query('users', $update_array, "uid = '{$user['uid']}'");
|
$cache->update_banned();
| |
// Log admin action
log_admin_action($user['uid'], $user['username'], $lifted);
|
// Log admin action
log_admin_action($user['uid'], $user['username'], $lifted);
|
| Zeile 423 | Zeile 431 |
|---|
$per_page = 20;
|
$per_page = 20;
|
| | $mybb->input['page'] = $mybb->get_input('page', MyBB::INPUT_INT);
|
if($mybb->input['page'] > 0)
{
|
if($mybb->input['page'] > 0)
{
|
$current_page = $mybb->get_input('page', MyBB::INPUT_INT);
| $current_page = $mybb->input['page'];
|
$start = ($current_page-1)*$per_page;
$pages = $ban_count / $per_page;
$pages = ceil($pages);
| $start = ($current_page-1)*$per_page;
$pages = $ban_count / $per_page;
$pages = ceil($pages);
|
| Zeile 449 | Zeile 458 |
|---|
$page->output_inline_error($errors);
}
|
$page->output_inline_error($errors);
}
|
if($mybb->input['uid'] && !$mybb->input['username'])
| $mybb->input['username'] = $mybb->get_input('username');
$mybb->input['reason'] = $mybb->get_input('reason');
$mybb->input['bantime'] = $mybb->get_input('bantime');
if(isset($mybb->input['uid']) && empty($mybb->input['username']))
|
{
$user = get_user($mybb->input['uid']);
$mybb->input['username'] = $user['username'];
|
{
$user = get_user($mybb->input['uid']);
$mybb->input['username'] = $user['username'];
|
| | }
if(empty($mybb->input['usergroup']))
{
if(!empty($mybb->settings['purgespammerbangroup']))
{
$mybb->input['usergroup'] = $mybb->settings['purgespammerbangroup'];
}
else if(count($banned_groups))
{
$group = array_keys($banned_groups);
$mybb->input['usergroup'] = $group[0];
}
else
{
$mybb->input['usergroup'] = 0;
}
|
}
$form_container = new FormContainer($lang->ban_a_user);
| }
$form_container = new FormContainer($lang->ban_a_user);
|
| Zeile 460 | Zeile 490 |
|---|
$form_container->output_row($lang->ban_reason, "", $form->generate_text_area('reason', $mybb->input['reason'], array('id' => 'reason', 'maxlength' => '255')), 'reason');
if(count($banned_groups) > 1)
{
|
$form_container->output_row($lang->ban_reason, "", $form->generate_text_area('reason', $mybb->input['reason'], array('id' => 'reason', 'maxlength' => '255')), 'reason');
if(count($banned_groups) > 1)
{
|
$form_container->output_row($lang->ban_group, $lang->add_ban_group_desc, $form->generate_select_box('usergroup', $banned_groups, $mybb->input['usergroup'], array('id' => 'usergroup')), 'usergroup');
| $form_container->output_row($lang->ban_group, $lang->ban_group_desc, $form->generate_select_box('usergroup', $banned_groups, $mybb->input['usergroup'], array('id' => 'usergroup')), 'usergroup');
|
}
foreach($ban_times as $time => $period)
{
| }
foreach($ban_times as $time => $period)
{
|
| Zeile 511 | Zeile 541 |
|---|
},
});
|
},
});
|
$(\'[for=username]\').click(function(){
| $(\'[for=username]\').on(\'click\', function(){
|
$("#username").select2(\'open\');
return false;
});
| $("#username").select2(\'open\');
return false;
});
|