Vergleich admin/modules/user/users.php - 1.8.3 - 1.8.4

Keine Änderungen Hinzugefügt Modifiziert Entfernt
Zeile 403	Zeile 403
$query = $db->simple_select("usergroups", "gid, title", "gid != '1'", array('order_by' => 'title')); while($usergroup = $db->fetch_array($query)) {	$query = $db->simple_select("usergroups", "gid, title", "gid != '1'", array('order_by' => 'title')); while($usergroup = $db->fetch_array($query)) {
$options[$usergroup['gid']] = $usergroup['title']; $display_group_options[$usergroup['gid']] = $usergroup['title'];	$options[$usergroup['gid']] = htmlspecialchars_uni($usergroup['title']); $display_group_options[$usergroup['gid']] = htmlspecialchars_uni($usergroup['title']);
} $form_container->output_row($lang->primary_user_group." <em>*</em>", "", $form->generate_select_box('usergroup', $options, $mybb->input['usergroup'], array('id' => 'usergroup')), 'usergroup');	} $form_container->output_row($lang->primary_user_group." <em>*</em>", "", $form->generate_select_box('usergroup', $options, $mybb->input['usergroup'], array('id' => 'usergroup')), 'usergroup');
Zeile 476	Zeile 476
$return_month = (int)substr($mybb->input['away_month'], 0, 2); $return_day = (int)substr($mybb->input['away_day'], 0, 2);	$return_month = (int)substr($mybb->input['away_month'], 0, 2); $return_day = (int)substr($mybb->input['away_day'], 0, 2);
$return_year = min((int)$mybb->input['away_year'], 9999);	$return_year = min($mybb->get_input('away_year', MyBB::INPUT_INT), 9999);
// Check if return date is after the away date. $returntimestamp = gmmktime(0, 0, 0, $return_month, $return_day, $return_year);	// Check if return date is after the away date. $returntimestamp = gmmktime(0, 0, 0, $return_month, $return_day, $return_year);
Zeile 522	Zeile 522
), "style" => $mybb->input['style'], "signature" => $mybb->input['signature'],	), "style" => $mybb->input['style'], "signature" => $mybb->input['signature'],
"dateformat" => (int)$mybb->input['dateformat'], "timeformat" => (int)$mybb->input['timeformat'],	"dateformat" => $mybb->get_input('dateformat', MyBB::INPUT_INT), "timeformat" => $mybb->get_input('timeformat', MyBB::INPUT_INT),
"language" => $mybb->input['language'], "usernotes" => $mybb->input['usernotes'], "away" => array(	"language" => $mybb->input['language'], "usernotes" => $mybb->input['usernotes'], "away" => array(
Zeile 572	Zeile 572
if($mybb->settings['usertppoptions']) {	if($mybb->settings['usertppoptions']) {
$updated_user['options']['tpp'] = (int)$mybb->input['tpp'];	$updated_user['options']['tpp'] = $mybb->get_input('tpp', MyBB::INPUT_INT);
} if($mybb->settings['userpppoptions']) {	} if($mybb->settings['userpppoptions']) {
$updated_user['options']['ppp'] = (int)$mybb->input['ppp'];	$updated_user['options']['ppp'] = $mybb->get_input('ppp', MyBB::INPUT_INT);
} // Set the data of the user in the datahandler.	} // Set the data of the user in the datahandler.
Zeile 652	Zeile 652
else { $mybb->input['avatar_url'] = preg_replace("#script:#i", "", $mybb->input['avatar_url']);	else { $mybb->input['avatar_url'] = preg_replace("#script:#i", "", $mybb->input['avatar_url']);
$mybb->input['avatar_url'] = htmlspecialchars($mybb->input['avatar_url']);
$ext = get_extension($mybb->input['avatar_url']); // Copy the avatar to the local server (work around remote URL access disabled for getimagesize)	$ext = get_extension($mybb->input['avatar_url']); // Copy the avatar to the local server (work around remote URL access disabled for getimagesize)
Zeile 868	Zeile 867
{ $mybb->input['bday'][0] = $mybb->input['bday1']; $mybb->input['bday'][1] = $mybb->input['bday2'];	{ $mybb->input['bday'][0] = $mybb->input['bday1']; $mybb->input['bday'][1] = $mybb->input['bday2'];
$mybb->input['bday'][2] = (int)$mybb->input['bday3'];	$mybb->input['bday'][2] = $mybb->get_input('bday3', MyBB::INPUT_INT);
} else {	} else {
Zeile 882	Zeile 881
if($mybb->input['away_day'] \|\| $mybb->input['away_month'] \|\| $mybb->input['away_year']) {	if($mybb->input['away_day'] \|\| $mybb->input['away_month'] \|\| $mybb->input['away_year']) {
$mybb->input['away_year'] = (int)$mybb->input['away_year'];	$mybb->input['away_year'] = $mybb->get_input('away_year', MyBB::INPUT_INT);
} else {	} else {
Zeile 918	Zeile 917
<link rel="stylesheet" href="../jscripts/sceditor/editor_themes/mybb.css" type="text/css" media="all" /> <script type="text/javascript" src="../jscripts/sceditor/jquery.sceditor.bbcode.min.js"></script>	<link rel="stylesheet" href="../jscripts/sceditor/editor_themes/mybb.css" type="text/css" media="all" /> <script type="text/javascript" src="../jscripts/sceditor/jquery.sceditor.bbcode.min.js"></script>
<script type="text/javascript" src="../jscripts/bbcodes_sceditor.js"></script>	<script type="text/javascript" src="../jscripts/bbcodes_sceditor.js?ver=1804"></script> <script type="text/javascript" src="../jscripts/sceditor/editor_plugins/undo.js?ver=1804"></script>
EOF; $page->output_header($lang->edit_user);	EOF; $page->output_header($lang->edit_user);
Zeile 1106	Zeile 1106
$query = $db->simple_select("usergroups", "gid, title", "gid != '1'", array('order_by' => 'title')); while($usergroup = $db->fetch_array($query)) {	$query = $db->simple_select("usergroups", "gid, title", "gid != '1'", array('order_by' => 'title')); while($usergroup = $db->fetch_array($query)) {
$options[$usergroup['gid']] = $usergroup['title']; $display_group_options[$usergroup['gid']] = $usergroup['title'];	$options[$usergroup['gid']] = htmlspecialchars_uni($usergroup['title']); $display_group_options[$usergroup['gid']] = htmlspecialchars_uni($usergroup['title']);
} if(!is_array($mybb->input['additionalgroups']))	} if(!is_array($mybb->input['additionalgroups']))
Zeile 1118	Zeile 1118
$form_container->output_row($lang->primary_user_group." <em></em>", "", $form->generate_select_box('usergroup', $options, $mybb->input['usergroup'], array('id' => 'usergroup')), 'usergroup'); $form_container->output_row($lang->additional_user_groups, $lang->additional_user_groups_desc, $form->generate_select_box('additionalgroups[]', $options, $mybb->input['additionalgroups'], array('id' => 'additionalgroups', 'multiple' => true, 'size' => 5)), 'additionalgroups'); $form_container->output_row($lang->display_user_group." <em></em>", "", $form->generate_select_box('displaygroup', $display_group_options, $mybb->input['displaygroup'], array('id' => 'displaygroup')), 'displaygroup');	$form_container->output_row($lang->primary_user_group." <em></em>", "", $form->generate_select_box('usergroup', $options, $mybb->input['usergroup'], array('id' => 'usergroup')), 'usergroup'); $form_container->output_row($lang->additional_user_groups, $lang->additional_user_groups_desc, $form->generate_select_box('additionalgroups[]', $options, $mybb->input['additionalgroups'], array('id' => 'additionalgroups', 'multiple' => true, 'size' => 5)), 'additionalgroups'); $form_container->output_row($lang->display_user_group." <em></em>", "", $form->generate_select_box('displaygroup', $display_group_options, $mybb->input['displaygroup'], array('id' => 'displaygroup')), 'displaygroup');
$form_container->output_row($lang->post_count." <em></em>", "", $form->generate_numeric_field('postnum', $mybb->input['postnum'], array('id' => 'postnum')), 'postnum'); $form_container->output_row($lang->thread_count." <em></em>", "", $form->generate_numeric_field('threadnum', $mybb->input['threadnum'], array('id' => 'threadnum')), 'threadnum');	$form_container->output_row($lang->post_count." <em></em>", "", $form->generate_numeric_field('postnum', $mybb->input['postnum'], array('id' => 'postnum', 'min' => 0)), 'postnum'); $form_container->output_row($lang->thread_count." <em></em>", "", $form->generate_numeric_field('threadnum', $mybb->input['threadnum'], array('id' => 'threadnum', 'min' => 0)), 'threadnum');
// Output custom profile fields - required if(!isset($profile_fields['required']))	// Output custom profile fields - required if(!isset($profile_fields['required']))
Zeile 1133	Zeile 1133
$form_container = new FormContainer($lang->optional_profile_info.": {$user['username']}"); $form_container->output_row($lang->custom_user_title, $lang->custom_user_title_desc, $form->generate_text_box('usertitle', $mybb->input['usertitle'], array('id' => 'usertitle')), 'usertitle'); $form_container->output_row($lang->website, "", $form->generate_text_box('website', $mybb->input['website'], array('id' => 'website')), 'website');	$form_container = new FormContainer($lang->optional_profile_info.": {$user['username']}"); $form_container->output_row($lang->custom_user_title, $lang->custom_user_title_desc, $form->generate_text_box('usertitle', $mybb->input['usertitle'], array('id' => 'usertitle')), 'usertitle'); $form_container->output_row($lang->website, "", $form->generate_text_box('website', $mybb->input['website'], array('id' => 'website')), 'website');
$form_container->output_row($lang->icq_number, "", $form->generate_numeric_field('icq', $mybb->input['icq'], array('id' => 'icq')), 'icq');	$form_container->output_row($lang->icq_number, "", $form->generate_numeric_field('icq', $mybb->input['icq'], array('id' => 'icq', 'min' => 0)), 'icq');
$form_container->output_row($lang->aim_handle, "", $form->generate_text_box('aim', $mybb->input['aim'], array('id' => 'aim')), 'aim'); $form_container->output_row($lang->yahoo_messanger_handle, "", $form->generate_text_box('yahoo', $mybb->input['yahoo'], array('id' => 'yahoo')), 'yahoo'); $form_container->output_row($lang->skype_handle, "", $form->generate_text_box('skype', $mybb->input['skype'], array('id' => 'skype')), 'skype');	$form_container->output_row($lang->aim_handle, "", $form->generate_text_box('aim', $mybb->input['aim'], array('id' => 'aim')), 'aim'); $form_container->output_row($lang->yahoo_messanger_handle, "", $form->generate_text_box('yahoo', $mybb->input['yahoo'], array('id' => 'yahoo')), 'yahoo'); $form_container->output_row($lang->skype_handle, "", $form->generate_text_box('skype', $mybb->input['skype'], array('id' => 'skype')), 'skype');
Zeile 1164	Zeile 1164
$birthday_row = $form->generate_select_box('bday1', $birthday_days, $mybb->input['bday'][0], array('id' => 'bday_day')); $birthday_row .= ' '.$form->generate_select_box('bday2', $birthday_months, $mybb->input['bday'][1], array('id' => 'bday_month'));	$birthday_row = $form->generate_select_box('bday1', $birthday_days, $mybb->input['bday'][0], array('id' => 'bday_day')); $birthday_row .= ' '.$form->generate_select_box('bday2', $birthday_months, $mybb->input['bday'][1], array('id' => 'bday_month'));
$birthday_row .= ' '.$form->generate_numeric_field('bday3', $mybb->input['bday'][2], array('id' => 'bday_year', 'style' => 'width: 3em;'));	$birthday_row .= ' '.$form->generate_numeric_field('bday3', $mybb->input['bday'][2], array('id' => 'bday_year', 'style' => 'width: 4em;', 'min' => 0));
$form_container->output_row($lang->birthday, "", $birthday_row, 'birthday');	$form_container->output_row($lang->birthday, "", $birthday_row, 'birthday');
Zeile 1188	Zeile 1188
//Return date (we can use the arrays from birthday) $return_row = $form->generate_select_box('away_day', $birthday_days, $mybb->input['away_day'], array('id' => 'away_day')); $return_row .= ' '.$form->generate_select_box('away_month', $birthday_months, $mybb->input['away_month'], array('id' => 'away_month'));	//Return date (we can use the arrays from birthday) $return_row = $form->generate_select_box('away_day', $birthday_days, $mybb->input['away_day'], array('id' => 'away_day')); $return_row .= ' '.$form->generate_select_box('away_month', $birthday_months, $mybb->input['away_month'], array('id' => 'away_month'));
$return_row .= ' '.$form->generate_numeric_field('away_year', $mybb->input['away_year'], array('id' => 'away_year', 'style' => 'width: 3em;'));	$return_row .= ' '.$form->generate_numeric_field('away_year', $mybb->input['away_year'], array('id' => 'away_year', 'style' => 'width: 4em;', 'min' => 0));
$form_container->output_row($lang->return_date, $lang->return_date_desc, $return_row, 'away_date');	$form_container->output_row($lang->return_date, $lang->return_date_desc, $return_row, 'away_date');
Zeile 1371	Zeile 1371
else { // There's a limit to the suspension!	else { // There's a limit to the suspension!
$expired = my_date('relative', $user['suspendsigtime']); $lang->suspend_expire_info = $lang->sprintf($lang->suspend_expire_info, $expired);	$remaining = $user['suspendsigtime']-TIME_NOW; $expired = nice_time($remaining, array('seconds' => false)); $color = 'inherit'; if($remaining < 3600) { $color = 'red'; } elseif($remaining < 86400) { $color = 'maroon'; } elseif($remaining < 604800) { $color = 'green'; } $lang->suspend_expire_info = $lang->sprintf($lang->suspend_expire_info, $expired, $color);
} $user_suspend_info = ' <tr>	} $user_suspend_info = ' <tr>
Zeile 1384	Zeile 1400
$sig_checked = 0; $user_suspend_info = ''; }	$sig_checked = 0; $user_suspend_info = ''; }

$actions = ' <script type="text/javascript"> <!-- var sig_checked = "'.$sig_checked.'"; function toggleAction()	$actions = ' <script type="text/javascript"> <!-- var sig_checked = "'.$sig_checked.'"; function toggleAction()
{	{
if($("#suspend_action").is(\':visible\')) { $("#suspend_action").hide();	if($("#suspend_action").is(\':visible\')) { $("#suspend_action").hide();
Zeile 1410	Zeile 1426
<table cellpadding="4">'.$user_suspend_info.' <tr> <td width="30%"><small>'.$lang->expire_length.'</small></td>	<table cellpadding="4">'.$user_suspend_info.' <tr> <td width="30%"><small>'.$lang->expire_length.'</small></td>
<td>'.$form->generate_numeric_field('action_time', $mybb->input['action_time'], array('style' => 'width: 2em;')).' '.$form->generate_select_box('action_period', $periods, $mybb->input['action_period']).'</td>	<td>'.$form->generate_numeric_field('action_time', $mybb->input['action_time'], array('style' => 'width: 3em;', 'min' => 0)).' '.$form->generate_select_box('action_period', $periods, $mybb->input['action_period']).'</td>
</tr> </table> </dd>	</tr> </table> </dd>
Zeile 1449	Zeile 1465
$avatar_url = ''; if($user['avatartype'] == "upload" \|\| stristr($user['avatar'], $mybb->settings['avataruploadpath']))	$avatar_url = ''; if($user['avatartype'] == "upload" \|\| stristr($user['avatar'], $mybb->settings['avataruploadpath']))
{	{
$current_avatar_msg = "<br /><strong>{$lang->user_current_using_uploaded_avatar}</strong>"; } elseif($user['avatartype'] == "remote" \|\| my_strpos(my_strtolower($user['avatar']), "http://") !== false)	$current_avatar_msg = "<br /><strong>{$lang->user_current_using_uploaded_avatar}</strong>"; } elseif($user['avatartype'] == "remote" \|\| my_strpos(my_strtolower($user['avatar']), "http://") !== false)
Zeile 1460	Zeile 1476
if($errors) {	if($errors) {
$avatar_url = $mybb->input['avatar_url'];	$avatar_url = htmlspecialchars_uni($mybb->input['avatar_url']);
} if($mybb->settings['maxavatardims'] != "")	} if($mybb->settings['maxavatardims'] != "")
Zeile 1525	Zeile 1541
{ $mybb->input['moderateposting'] = 1; if($user['moderationtime'] != 0)	{ $mybb->input['moderateposting'] = 1; if($user['moderationtime'] != 0)
{ $expired = my_date('relative', $user['moderationtime']); $existing_info = $lang->sprintf($lang->moderate_length, $expired);	{ $remaining = $user['moderationtime']-TIME_NOW; $expired = nice_time($remaining, array('seconds' => false)); $color = 'inherit'; if($remaining < 3600) { $color = 'red'; } elseif($remaining < 86400) { $color = 'maroon'; } elseif($remaining < 604800) { $color = 'green'; } $existing_info = $lang->sprintf($lang->moderate_length, $expired, $color);
} else {	} else {
Zeile 1535	Zeile 1567
} }	} }
$modpost_div = '<div id="modpost">'.$existing_info.''.$lang->moderate_for.' '.$form->generate_numeric_field("modpost_time", $mybb->input['modpost_time'], array('style' => 'width: 2em;')).' '.$modpost_options.'</div>';	$modpost_div = '<div id="modpost">'.$existing_info.''.$lang->moderate_for.' '.$form->generate_numeric_field("modpost_time", $mybb->input['modpost_time'], array('style' => 'width: 3em;', 'min' => 0)).' '.$modpost_options.'</div>';
$lang->moderate_posts_info = $lang->sprintf($lang->moderate_posts_info, $user['username']); $form_container->output_row($form->generate_check_box("moderateposting", 1, $lang->moderate_posts, array("id" => "moderateposting", "onclick" => "toggleBox('modpost');", "checked" => $mybb->input['moderateposting'])), $lang->moderate_posts_info, $modpost_div);	$lang->moderate_posts_info = $lang->sprintf($lang->moderate_posts_info, $user['username']); $form_container->output_row($form->generate_check_box("moderateposting", 1, $lang->moderate_posts, array("id" => "moderateposting", "onclick" => "toggleBox('modpost');", "checked" => $mybb->input['moderateposting'])), $lang->moderate_posts_info, $modpost_div);
Zeile 1554	Zeile 1586
} else {	} else {
$suspost_date = my_date('relative', $user['suspensiontime']); $existing_info = $lang->sprintf($lang->suspend_length, $suspost_date);	$remaining = $user['suspensiontime']-TIME_NOW; $suspost_date = nice_time($remaining, array('seconds' => false)); $color = 'inherit'; if($remaining < 3600) { $color = 'red'; } elseif($remaining < 86400) { $color = 'maroon'; } elseif($remaining < 604800) { $color = 'green'; } $existing_info = $lang->sprintf($lang->suspend_length, $suspost_date, $color);
} }	} }
$suspost_div = '<div id="suspost">'.$existing_info.''.$lang->suspend_for.' '.$form->generate_numeric_field("suspost_time", $mybb->input['suspost_time'], array('style' => 'width: 2em;')).' '.$suspost_options.'</div>';	$suspost_div = '<div id="suspost">'.$existing_info.''.$lang->suspend_for.' '.$form->generate_numeric_field("suspost_time", $mybb->input['suspost_time'], array('style' => 'width: 3em;', 'min' => 0)).' '.$suspost_options.'</div>';
$lang->suspend_posts_info = $lang->sprintf($lang->suspend_posts_info, $user['username']); $form_container->output_row($form->generate_check_box("suspendposting", 1, $lang->suspend_posts, array("id" => "suspendposting", "onclick" => "toggleBox('suspost');", "checked" => $mybb->input['suspendposting'])), $lang->suspend_posts_info, $suspost_div);	$lang->suspend_posts_info = $lang->sprintf($lang->suspend_posts_info, $user['username']); $form_container->output_row($form->generate_check_box("suspendposting", 1, $lang->suspend_posts, array("id" => "suspendposting", "onclick" => "toggleBox('suspost');", "checked" => $mybb->input['suspendposting'])), $lang->suspend_posts_info, $suspost_div);

$form_container->end(); echo "</div>\n";	$form_container->end(); echo "</div>\n";

$plugins->run_hooks("admin_user_users_edit_graph"); $buttons[] = $form->generate_submit_button($lang->save_user);	$plugins->run_hooks("admin_user_users_edit_graph"); $buttons[] = $form->generate_submit_button($lang->save_user);
Zeile 1601	Zeile 1649
if($("#suspendposting").is(":checked") == true) { $("#suspost").show();	if($("#suspendposting").is(":checked") == true) { $("#suspost").show();
}	}
else if($("#suspendposting").is(":checked") == false) { $("#suspost").hide(); } }	else if($("#suspendposting").is(":checked") == false) { $("#suspost").hide(); } }
}	}
if($("#moderateposting").is(":checked") == false)	if($("#moderateposting").is(":checked") == false)
{	{
$("#modpost").hide(); } else	$("#modpost").hide(); } else
Zeile 1619	Zeile 1667
} if($("#suspendposting").is(":checked") == false)	} if($("#suspendposting").is(":checked") == false)
{	{
$("#suspost").hide(); } else { $("#suspost").show();	$("#suspost").hide(); } else { $("#suspost").show();
}	}
// --> </script>';	// --> </script>';
Zeile 1636	Zeile 1684
if($mybb->input['action'] == "delete") { $user = get_user($mybb->input['uid']);	if($mybb->input['action'] == "delete") { $user = get_user($mybb->input['uid']);

// Does the user not exist? if(!$user['uid']) {	// Does the user not exist? if(!$user['uid']) {
Zeile 1672	Zeile 1720
flash_message($lang->error_cannot_delete_user, 'error'); admin_redirect("index.php?module=user-users"); }	flash_message($lang->error_cannot_delete_user, 'error'); admin_redirect("index.php?module=user-users"); }
	$cache->update_awaitingactivation();
$plugins->run_hooks("admin_user_users_delete_commit_end");	$plugins->run_hooks("admin_user_users_delete_commit_end");
Zeile 1772	Zeile 1822
$user['lastip'] = my_inet_ntop($db->unescape_binary($user['lastip'])); $popup = new PopupMenu("user_last", $lang->options); $popup->add_item($lang->show_users_regged_with_ip,	$user['lastip'] = my_inet_ntop($db->unescape_binary($user['lastip'])); $popup = new PopupMenu("user_last", $lang->options); $popup->add_item($lang->show_users_regged_with_ip,
"index.php?module=user-users&action=search&results=1&conditions=".urlencode(serialize(array("regip" => $user['lastip'])))); $popup->add_item($lang->show_users_posted_with_ip, "index.php?module=user-users&results=1&action=search&conditions=".urlencode(serialize(array("postip" => $user['lastip']))));	"index.php?module=user-users&action=search&results=1&conditions=".urlencode(my_serialize(array("regip" => $user['lastip'])))); $popup->add_item($lang->show_users_posted_with_ip, "index.php?module=user-users&results=1&action=search&conditions=".urlencode(my_serialize(array("postip" => $user['lastip']))));
$popup->add_item($lang->info_on_ip, "index.php?module=user-users&action=iplookup&ipaddress={$user['lastip']}", "MyBB.popupWindow('index.php?module=user-users&action=iplookup&ipaddress={$user['lastip']}', null, true); return false;"); $popup->add_item($lang->ban_ip, "index.php?module=config-banning&filter={$user['lastip']}"); $controls = $popup->fetch();	$popup->add_item($lang->info_on_ip, "index.php?module=user-users&action=iplookup&ipaddress={$user['lastip']}", "MyBB.popupWindow('index.php?module=user-users&action=iplookup&ipaddress={$user['lastip']}', null, true); return false;"); $popup->add_item($lang->ban_ip, "index.php?module=config-banning&filter={$user['lastip']}"); $controls = $popup->fetch();
Zeile 1791	Zeile 1841
{ $user['regip'] = my_inet_ntop($db->unescape_binary($user['regip'])); $popup = new PopupMenu("user_reg", $lang->options);	{ $user['regip'] = my_inet_ntop($db->unescape_binary($user['regip'])); $popup = new PopupMenu("user_reg", $lang->options);
$popup->add_item($lang->show_users_regged_with_ip, "index.php?module=user-users&results=1&action=search&conditions=".urlencode(serialize(array("regip" => $user['regip'])))); $popup->add_item($lang->show_users_posted_with_ip, "index.php?module=user-users&results=1&action=search&conditions=".urlencode(serialize(array("postip" => $user['regip']))));	$popup->add_item($lang->show_users_regged_with_ip, "index.php?module=user-users&results=1&action=search&conditions=".urlencode(my_serialize(array("regip" => $user['regip'])))); $popup->add_item($lang->show_users_posted_with_ip, "index.php?module=user-users&results=1&action=search&conditions=".urlencode(my_serialize(array("postip" => $user['regip']))));
$popup->add_item($lang->info_on_ip, "index.php?module=user-users&action=iplookup&ipaddress={$user['regip']}", "MyBB.popupWindow('index.php?module=user-users&action=iplookup&ipaddress={$user['regip']}', null, true); return false;"); $popup->add_item($lang->ban_ip, "index.php?module=config-banning&filter={$user['regip']}"); $controls = $popup->fetch();	$popup->add_item($lang->info_on_ip, "index.php?module=user-users&action=iplookup&ipaddress={$user['regip']}", "MyBB.popupWindow('index.php?module=user-users&action=iplookup&ipaddress={$user['regip']}', null, true); return false;"); $popup->add_item($lang->ban_ip, "index.php?module=config-banning&filter={$user['regip']}"); $controls = $popup->fetch();
Zeile 1809	Zeile 1859
++$counter; $ip['ipaddress'] = my_inet_ntop($db->unescape_binary($ip['ipaddress'])); $popup = new PopupMenu("id_{$counter}", $lang->options);	++$counter; $ip['ipaddress'] = my_inet_ntop($db->unescape_binary($ip['ipaddress'])); $popup = new PopupMenu("id_{$counter}", $lang->options);
$popup->add_item($lang->show_users_regged_with_ip, "index.php?module=user-users&results=1&action=search&conditions=".urlencode(serialize(array("regip" => $ip['ipaddress'])))); $popup->add_item($lang->show_users_posted_with_ip, "index.php?module=user-users&results=1&action=search&conditions=".urlencode(serialize(array("postip" => $ip['ipaddress']))));	$popup->add_item($lang->show_users_regged_with_ip, "index.php?module=user-users&results=1&action=search&conditions=".urlencode(my_serialize(array("regip" => $ip['ipaddress'])))); $popup->add_item($lang->show_users_posted_with_ip, "index.php?module=user-users&results=1&action=search&conditions=".urlencode(my_serialize(array("postip" => $ip['ipaddress']))));
$popup->add_item($lang->info_on_ip, "index.php?module=user-users&action=iplookup&ipaddress={$ip['ipaddress']}", "MyBB.popupWindow('index.php?module=user-users&action=iplookup&ipaddress={$ip['ipaddress']}', null, true); return false;"); $popup->add_item($lang->ban_ip, "index.php?module=config-banning&filter={$ip['ipaddress']}"); $controls = $popup->fetch();	$popup->add_item($lang->info_on_ip, "index.php?module=user-users&action=iplookup&ipaddress={$ip['ipaddress']}", "MyBB.popupWindow('index.php?module=user-users&action=iplookup&ipaddress={$ip['ipaddress']}', null, true); return false;"); $popup->add_item($lang->ban_ip, "index.php?module=config-banning&filter={$ip['ipaddress']}"); $controls = $popup->fetch();
Zeile 1839	Zeile 1889
$destination_user = get_user_by_username($mybb->input['destination_username'], array('fields' => '*')); if(!$destination_user['uid'])	$destination_user = get_user_by_username($mybb->input['destination_username'], array('fields' => '*')); if(!$destination_user['uid'])
{	{
$errors[] = $lang->error_invalid_user_destination; }	$errors[] = $lang->error_invalid_user_destination; }
Zeile 2046	Zeile 2096
} $plugins->run_hooks("admin_user_users_merge_commit");	} $plugins->run_hooks("admin_user_users_merge_commit");
	$cache->update_awaitingactivation();
// Log admin action log_admin_action($source_user['uid'], $source_user['username'], $destination_user['uid'], $destination_user['username']);	// Log admin action log_admin_action($source_user['uid'], $source_user['username'], $destination_user['uid'], $destination_user['username']);
Zeile 2078	Zeile 2130
// Autocompletion for usernames echo ' <link rel="stylesheet" href="../jscripts/select2/select2.css">	// Autocompletion for usernames echo ' <link rel="stylesheet" href="../jscripts/select2/select2.css">
<script type="text/javascript" src="../jscripts/select2/select2.min.js"></script>	<script type="text/javascript" src="../jscripts/select2/select2.min.js?ver=1804"></script>
<script type="text/javascript"> <!-- $("#source_username").select2({	<script type="text/javascript"> <!-- $("#source_username").select2({
Zeile 2160	Zeile 2212
// Build view options from incoming search options if($mybb->input['vid']) {	// Build view options from incoming search options if($mybb->input['vid']) {
$query = $db->simple_select("adminviews", "*", "vid='".$mybb->get_input('vid', 1)."'");	$query = $db->simple_select("adminviews", "*", "vid='".$mybb->get_input('vid', MyBB::INPUT_INT)."'");
$admin_view = $db->fetch_array($query); // View does not exist or this view is private and does not belong to the current user if(!$admin_view['vid'] \|\| ($admin_view['visibility'] == 1 && $admin_view['uid'] != $mybb->user['uid']))	$admin_view = $db->fetch_array($query); // View does not exist or this view is private and does not belong to the current user if(!$admin_view['vid'] \|\| ($admin_view['visibility'] == 1 && $admin_view['uid'] != $mybb->user['uid']))
Zeile 2207	Zeile 2259
$admin_view['sortby'] = $mybb->input['sortby']; }	$admin_view['sortby'] = $mybb->input['sortby']; }
if($mybb->get_input('perpage', 1))	if($mybb->get_input('perpage', MyBB::INPUT_INT))
{ $admin_view['perpage'] = $mybb->input['perpage']; }	{ $admin_view['perpage'] = $mybb->input['perpage']; }
Zeile 2280	Zeile 2332
"desc" => $lang->descending ); $form_container->output_row($lang->sort_results_by, "", $form->generate_select_box('sortby', $sort_options, $mybb->input['sortby'], array('id' => 'sortby'))." {$lang->in} ".$form->generate_select_box('order', $sort_directions, $mybb->input['order'], array('id' => 'order')), 'sortby');	"desc" => $lang->descending ); $form_container->output_row($lang->sort_results_by, "", $form->generate_select_box('sortby', $sort_options, $mybb->input['sortby'], array('id' => 'sortby'))." {$lang->in} ".$form->generate_select_box('order', $sort_directions, $mybb->input['order'], array('id' => 'order')), 'sortby');
$form_container->output_row($lang->results_per_page, "", $form->generate_numeric_field('perpage', $mybb->input['perpage'], array('id' => 'perpage')), 'perpage');	$form_container->output_row($lang->results_per_page, "", $form->generate_numeric_field('perpage', $mybb->input['perpage'], array('id' => 'perpage', 'min' => 1)), 'perpage');
$form_container->output_row($lang->display_results_as, "", $form->generate_radio_button('displayas', 'table', $lang->table, array('checked' => ($mybb->input['displayas'] != "card" ? true : false)))."<br />".$form->generate_radio_button('displayas', 'card', $lang->business_card, array('checked' => ($mybb->input['displayas'] == "card" ? true : false)))); $form_container->end();	$form_container->output_row($lang->display_results_as, "", $form->generate_radio_button('displayas', 'table', $lang->table, array('checked' => ($mybb->input['displayas'] != "card" ? true : false)))."<br />".$form->generate_radio_button('displayas', 'card', $lang->business_card, array('checked' => ($mybb->input['displayas'] == "card" ? true : false)))); $form_container->end();
Zeile 2296	Zeile 2348
$plugins->run_hooks("admin_user_users_inline"); if($mybb->input['vid'] \|\| $mybb->cookies['acp_view'])	$plugins->run_hooks("admin_user_users_inline"); if($mybb->input['vid'] \|\| $mybb->cookies['acp_view'])
{	{
// We have a custom view if(!$mybb->cookies['acp_view']) {	// We have a custom view if(!$mybb->cookies['acp_view']) {
Zeile 2500	Zeile 2552
// Not currently banned - insert the ban $insert_array = array( 'uid' => $user['uid'],	// Not currently banned - insert the ban $insert_array = array( 'uid' => $user['uid'],
'gid' => (int)$mybb->input['usergroup'],	'gid' => $mybb->get_input('usergroup', MyBB::INPUT_INT),
'oldgroup' => $user['usergroup'], 'oldadditionalgroups' => $user['additionalgroups'], 'olddisplaygroup' => $user['displaygroup'],	'oldgroup' => $user['usergroup'], 'oldadditionalgroups' => $user['additionalgroups'], 'olddisplaygroup' => $user['displaygroup'],
Zeile 2600	Zeile 2652
log_admin_action($to_be_deleted); $lang->users_deleted = $lang->sprintf($lang->users_deleted, $to_be_deleted);	log_admin_action($to_be_deleted); $lang->users_deleted = $lang->sprintf($lang->users_deleted, $to_be_deleted);
	$cache->update_awaitingactivation();
flash_message($lang->users_deleted, 'success'); admin_redirect("index.php?module=user-users".$vid_url); }	flash_message($lang->users_deleted, 'success'); admin_redirect("index.php?module=user-users".$vid_url); }
Zeile 2617	Zeile 2672
$errors[] = $lang->multi_selected_dates; }	$errors[] = $lang->multi_selected_dates; }
$day = (int)$mybb->input['day']; $month = (int)$mybb->input['month']; $year = (int)$mybb->input['year'];	$day = $mybb->get_input('day', MyBB::INPUT_INT); $month = $mybb->get_input('month', MyBB::INPUT_INT); $year = $mybb->get_input('year', MyBB::INPUT_INT);
// Selected a date - check if the date the user entered is valid if($mybb->input['day'] \|\| $mybb->input['month'] \|\| $mybb->input['year'])	// Selected a date - check if the date the user entered is valid if($mybb->input['day'] \|\| $mybb->input['month'] \|\| $mybb->input['year'])
Zeile 2632	Zeile 2687
// Check the month $months = get_bdays($year);	// Check the month $months = get_bdays($year);
if($day > $months[$month]-1)	if($day > $months[$month-1])
{ $errors[] = $lang->incorrect_date; }	{ $errors[] = $lang->incorrect_date; }
Zeile 2813	Zeile 2868
} $date_box = $form->generate_select_box('day', $day_options, $mybb->input['day']); $month_box = $form->generate_select_box('month', $month_options, $mybb->input['month']);	} $date_box = $form->generate_select_box('day', $day_options, $mybb->input['day']); $month_box = $form->generate_select_box('month', $month_options, $mybb->input['month']);
$year_box = $form->generate_numeric_field('year', $mybb->input['year'], array('id' => 'year', 'style' => 'width: 50px;'));	$year_box = $form->generate_numeric_field('year', $mybb->input['year'], array('id' => 'year', 'style' => 'width: 50px;', 'min' => 0));
$prune_select = $date_box.$month_box.$year_box; $form_container->output_row($lang->manual_date, "", $prune_select, 'date');	$prune_select = $date_box.$month_box.$year_box; $form_container->output_row($lang->manual_date, "", $prune_select, 'date');
Zeile 2858	Zeile 2913
// Create an update array $update_array = array(	// Create an update array $update_array = array(
"usergroup" => (int)$mybb->input['usergroup'],	"usergroup" => $mybb->get_input('usergroup', MyBB::INPUT_INT),
"additionalgroups" => $additionalgroups,	"additionalgroups" => $additionalgroups,
"displaygroup" => (int)$mybb->input['displaygroup']	"displaygroup" => $mybb->get_input('displaygroup', MyBB::INPUT_INT)
); // Do the usergroup update for all those selected	); // Do the usergroup update for all those selected
Zeile 2923	Zeile 2978
$query = $db->simple_select("usergroups", "gid, title", "gid != '1'", array('order_by' => 'title')); while($usergroup = $db->fetch_array($query)) {	$query = $db->simple_select("usergroups", "gid, title", "gid != '1'", array('order_by' => 'title')); while($usergroup = $db->fetch_array($query)) {
$options[$usergroup['gid']] = $usergroup['title']; $display_group_options[$usergroup['gid']] = $usergroup['title'];	$options[$usergroup['gid']] = htmlspecialchars_uni($usergroup['title']); $display_group_options[$usergroup['gid']] = htmlspecialchars_uni($usergroup['title']);
} if(!is_array($mybb->input['additionalgroups']))	} if(!is_array($mybb->input['additionalgroups']))
Zeile 2966	Zeile 3021
// Showing a specific view if(isset($mybb->input['vid'])) {	// Showing a specific view if(isset($mybb->input['vid'])) {
$query = $db->simple_select("adminviews", "*", "vid='".$mybb->get_input('vid', 1)."'");	$query = $db->simple_select("adminviews", "*", "vid='".$mybb->get_input('vid', MyBB::INPUT_INT)."'");
$admin_view = $db->fetch_array($query); // View does not exist or this view is private and does not belong to the current user if(!$admin_view['vid'] \|\| ($admin_view['visibility'] == 1 && $admin_view['uid'] != $mybb->user['uid']))	$admin_view = $db->fetch_array($query); // View does not exist or this view is private and does not belong to the current user if(!$admin_view['vid'] \|\| ($admin_view['visibility'] == 1 && $admin_view['uid'] != $mybb->user['uid']))
Zeile 3380	Zeile 3435
} else {	} else {
$mybb->input['page'] = $mybb->get_input('page', 1);	$mybb->input['page'] = $mybb->get_input('page', MyBB::INPUT_INT);
} if($mybb->input['page'])	} if($mybb->input['page'])
Zeile 3440	Zeile 3495
{ $comma = $groups_list = ''; $user['view']['username'] = "<a href=\"index.php?module=user-users&action=edit&uid={$user['uid']}\">".format_name($user['username'], $user['usergroup'], $user['displaygroup'])."</a>";	{ $comma = $groups_list = ''; $user['view']['username'] = "<a href=\"index.php?module=user-users&action=edit&uid={$user['uid']}\">".format_name($user['username'], $user['usergroup'], $user['displaygroup'])."</a>";
$user['view']['usergroup'] = $usergroups[$user['usergroup']]['title'];	$user['view']['usergroup'] = htmlspecialchars_uni($usergroups[$user['usergroup']]['title']);
if($user['additionalgroups']) { $additional_groups = explode(",", $user['additionalgroups']); foreach($additional_groups as $group) {	if($user['additionalgroups']) { $additional_groups = explode(",", $user['additionalgroups']); foreach($additional_groups as $group) {
$groups_list .= "{$comma}{$usergroups[$group]['title']}";	$groups_list .= $comma.htmlspecialchars_uni($usergroups[$group]['title']);
$comma = $lang->comma; } }	$comma = $lang->comma; } }
Zeile 3565	Zeile 3620
$switch_url = $view['url']; if($mybb->input['page'] > 0) {	$switch_url = $view['url']; if($mybb->input['page'] > 0) {
$switch_url .= "&page=".$mybb->get_input('page', 1);	$switch_url .= "&page=".$mybb->get_input('page', MyBB::INPUT_INT);
} if($view['view_type'] != "card") {	} if($view['view_type'] != "card") {
Zeile 3857	Zeile 3912
} foreach($fields as $profile_field) {	} foreach($fields as $profile_field) {
	$profile_field['name'] = htmlspecialchars_uni($profile_field['name']); $profile_field['description'] = htmlspecialchars_uni($profile_field['description']);
$profile_field['type'] = htmlspecialchars_uni($profile_field['type']); list($type, $options) = explode("\n", $profile_field['type'], 2); $type = trim($type);	$profile_field['type'] = htmlspecialchars_uni($profile_field['type']); list($type, $options) = explode("\n", $profile_field['type'], 2); $type = trim($type);
Zeile 4021	Zeile 4078
$query = $db->simple_select("usergroups", "gid, title", "gid != '1'", array('order_by' => 'title')); while($usergroup = $db->fetch_array($query)) {	$query = $db->simple_select("usergroups", "gid, title", "gid != '1'", array('order_by' => 'title')); while($usergroup = $db->fetch_array($query)) {
$options[$usergroup['gid']] = $usergroup['title'];	$options[$usergroup['gid']] = htmlspecialchars_uni($usergroup['title']);
} $form_container->output_row($lang->is_member_of_groups, $lang->additional_user_groups_desc, $form->generate_select_box('conditions[usergroup][]', $options, $input['conditions']['usergroup'], array('id' => 'usergroups', 'multiple' => true, 'size' => 5)), 'usergroups'); $form_container->output_row($lang->website_contains, "", $form->generate_text_box('conditions[website]', $input['conditions']['website'], array('id' => 'website'))." {$lang->or} ".$form->generate_check_box('conditions[website_blank]', 1, $lang->is_not_blank, array('id' => 'website_blank', 'checked' => $input['conditions']['website_blank'])), 'website');	} $form_container->output_row($lang->is_member_of_groups, $lang->additional_user_groups_desc, $form->generate_select_box('conditions[usergroup][]', $options, $input['conditions']['usergroup'], array('id' => 'usergroups', 'multiple' => true, 'size' => 5)), 'usergroups'); $form_container->output_row($lang->website_contains, "", $form->generate_text_box('conditions[website]', $input['conditions']['website'], array('id' => 'website'))." {$lang->or} ".$form->generate_check_box('conditions[website_blank]', 1, $lang->is_not_blank, array('id' => 'website_blank', 'checked' => $input['conditions']['website_blank'])), 'website');
$form_container->output_row($lang->icq_number_contains, "", $form->generate_numeric_field('conditions[icq]', $input['conditions']['icq'], array('id' => 'icq'))." {$lang->or} ".$form->generate_check_box('conditions[icq_blank]', 1, $lang->is_not_blank, array('id' => 'icq_blank', 'checked' => $input['conditions']['icq_blank'])), 'icq');	$form_container->output_row($lang->icq_number_contains, "", $form->generate_text_box('conditions[icq]', $input['conditions']['icq'], array('id' => 'icq'))." {$lang->or} ".$form->generate_check_box('conditions[icq_blank]', 1, $lang->is_not_blank, array('id' => 'icq_blank', 'checked' => $input['conditions']['icq_blank'])), 'icq');
$form_container->output_row($lang->aim_handle_contains, "", $form->generate_text_box('conditions[aim]', $input['conditions']['aim'], array('id' => 'aim'))." {$lang->or} ".$form->generate_check_box('conditions[aim_blank]', 1, $lang->is_not_blank, array('id' => 'aim_blank', 'checked' => $input['conditions']['aim_blank'])), 'aim'); $form_container->output_row($lang->yahoo_contains, "", $form->generate_text_box('conditions[yahoo]', $input['conditions']['yahoo'], array('id' => 'yahoo'))." {$lang->or} ".$form->generate_check_box('conditions[yahoo_blank]', 1, $lang->is_not_blank, array('id' => 'yahoo_blank', 'checked' => $input['conditions']['yahoo_blank'])), 'yahoo'); $form_container->output_row($lang->skype_contains, "", $form->generate_text_box('conditions[skype]', $input['conditions']['skype'], array('id' => 'skype'))." {$lang->or} ".$form->generate_check_box('conditions[skype_blank]', 1, $lang->is_not_blank, array('id' => 'skype_blank', 'checked' => $input['conditions']['skype_blank'])), 'skype');	$form_container->output_row($lang->aim_handle_contains, "", $form->generate_text_box('conditions[aim]', $input['conditions']['aim'], array('id' => 'aim'))." {$lang->or} ".$form->generate_check_box('conditions[aim_blank]', 1, $lang->is_not_blank, array('id' => 'aim_blank', 'checked' => $input['conditions']['aim_blank'])), 'aim'); $form_container->output_row($lang->yahoo_contains, "", $form->generate_text_box('conditions[yahoo]', $input['conditions']['yahoo'], array('id' => 'yahoo'))." {$lang->or} ".$form->generate_check_box('conditions[yahoo_blank]', 1, $lang->is_not_blank, array('id' => 'yahoo_blank', 'checked' => $input['conditions']['yahoo_blank'])), 'yahoo'); $form_container->output_row($lang->skype_contains, "", $form->generate_text_box('conditions[skype]', $input['conditions']['skype'], array('id' => 'skype'))." {$lang->or} ".$form->generate_check_box('conditions[skype_blank]', 1, $lang->is_not_blank, array('id' => 'skype_blank', 'checked' => $input['conditions']['skype_blank'])), 'skype');
Zeile 4039	Zeile 4096
"is_exactly" => $lang->is_exactly, "less_than" => $lang->less_than );	"is_exactly" => $lang->is_exactly, "less_than" => $lang->less_than );
$form_container->output_row($lang->post_count_is, "", $form->generate_select_box('conditions[postnum_dir]', $greater_options, $input['conditions']['postnum_dir'], array('id' => 'numposts_dir'))." ".$form->generate_numeric_field('conditions[postnum]', $input['conditions']['postnum'], array('id' => 'numposts')), 'numposts'); $form_container->output_row($lang->thread_count_is, "", $form->generate_select_box('conditions[threadnum_dir]', $greater_options, $input['conditions']['threadnum_dir'], array('id' => 'numthreads_dir'))." ".$form->generate_numeric_field('conditions[threadnum]', $input['conditions']['threadnum'], array('id' => 'numthreads')), 'numthreads');	$form_container->output_row($lang->post_count_is, "", $form->generate_select_box('conditions[postnum_dir]', $greater_options, $input['conditions']['postnum_dir'], array('id' => 'numposts_dir'))." ".$form->generate_text_box('conditions[postnum]', $input['conditions']['postnum'], array('id' => 'numposts')), 'numposts'); $form_container->output_row($lang->thread_count_is, "", $form->generate_select_box('conditions[threadnum_dir]', $greater_options, $input['conditions']['threadnum_dir'], array('id' => 'numthreads_dir'))." ".$form->generate_text_box('conditions[threadnum]', $input['conditions']['threadnum'], array('id' => 'numthreads')), 'numthreads');
$form_container->output_row($lang->reg_in_x_days, '', $form->generate_text_box('conditions[regdate]', $input['conditions']['regdate'], array('id' => 'regdate')).' '.$lang->days, 'regdate'); $form_container->output_row($lang->reg_ip_matches, $lang->wildcard, $form->generate_text_box('conditions[regip]', $input['conditions']['regip'], array('id' => 'regip')), 'regip');	$form_container->output_row($lang->reg_in_x_days, '', $form->generate_text_box('conditions[regdate]', $input['conditions']['regdate'], array('id' => 'regdate')).' '.$lang->days, 'regdate'); $form_container->output_row($lang->reg_ip_matches, $lang->wildcard, $form->generate_text_box('conditions[regip]', $input['conditions']['regip'], array('id' => 'regip')), 'regip');
Zeile 4076	Zeile 4133
// Autocompletion for usernames echo ' <link rel="stylesheet" href="../jscripts/select2/select2.css">	// Autocompletion for usernames echo ' <link rel="stylesheet" href="../jscripts/select2/select2.css">
<script type="text/javascript" src="../jscripts/select2/select2.min.js"></script>	<script type="text/javascript" src="../jscripts/select2/select2.min.js?ver=1804"></script>
<script type="text/javascript"> <!-- $("#username").select2({	<script type="text/javascript"> <!-- $("#username").select2({