Vergleich admin/modules/user/users.php - 1.8.14 - 1.8.22

Keine Änderungen Hinzugefügt Modifiziert Entfernt
Zeile 254	Zeile 254
my_mail($user['email'], $lang->sprintf($lang->emailsubject_activateaccount, $mybb->settings['bbname']), $message); // Log admin action	my_mail($user['email'], $lang->sprintf($lang->emailsubject_activateaccount, $mybb->settings['bbname']), $message); // Log admin action
log_admin_action($user['uid'], htmlspecialchars_uni($user['username']));	log_admin_action($user['uid'], $user['username']);
if($mybb->input['from'] == "home") {	if($mybb->input['from'] == "home") {
Zeile 359	Zeile 359
$plugins->run_hooks("admin_user_users_add_commit"); // Log admin action	$plugins->run_hooks("admin_user_users_add_commit"); // Log admin action
log_admin_action($user_info['uid'], htmlspecialchars_uni($user_info['username']));	log_admin_action($user_info['uid'], $user_info['username']);
flash_message($lang->success_user_created, 'success'); admin_redirect("index.php?module=user-users&action=edit&uid={$user_info['uid']}");	flash_message($lang->success_user_created, 'success'); admin_redirect("index.php?module=user-users&action=edit&uid={$user_info['uid']}");
Zeile 512	Zeile 512
"profile_fields_editable" => true, "website" => $mybb->input['website'], "icq" => $mybb->input['icq'],	"profile_fields_editable" => true, "website" => $mybb->input['website'], "icq" => $mybb->input['icq'],
"aim" => $mybb->input['aim'], "yahoo" => $mybb->input['yahoo'],
"skype" => $mybb->input['skype'], "google" => $mybb->input['google'], "birthday" => array(	"skype" => $mybb->input['skype'], "google" => $mybb->input['google'], "birthday" => array(
Zeile 646	Zeile 644
} // Because Gravatars are square, hijack the width	} // Because Gravatars are square, hijack the width
list($maxwidth, $maxheight) = explode("x", my_strtolower($mybb->settings['maxavatardims']));	list($maxwidth, $maxheight) = preg_split('/[\|x]/', my_strtolower($mybb->settings['maxavatardims']));
$s = "?s={$maxwidth}"; $maxheight = (int)$maxwidth;	$s = "?s={$maxwidth}"; $maxheight = (int)$maxwidth;
Zeile 694	Zeile 692
{ if($width && $height && $mybb->settings['maxavatardims'] != "") {	{ if($width && $height && $mybb->settings['maxavatardims'] != "") {
list($maxwidth, $maxheight) = explode("x", my_strtolower($mybb->settings['maxavatardims']));	list($maxwidth, $maxheight) = preg_split('/[\|x]/', my_strtolower($mybb->settings['maxavatardims']));
if(($maxwidth && $width > $maxwidth) \|\| ($maxheight && $height > $maxheight)) { $lang->error_avatartoobig = $lang->sprintf($lang->error_avatartoobig, $maxwidth, $maxheight);	if(($maxwidth && $width > $maxwidth) \|\| ($maxheight && $height > $maxheight)) { $lang->error_avatartoobig = $lang->sprintf($lang->error_avatartoobig, $maxwidth, $maxheight);
Zeile 844	Zeile 842
} // Log admin action	} // Log admin action
log_admin_action($user['uid'], htmlspecialchars_uni($mybb->input['username']));	log_admin_action($user['uid'], $mybb->input['username']);
flash_message($lang->success_user_updated, 'success'); admin_redirect("index.php?module=user-users");	flash_message($lang->success_user_updated, 'success'); admin_redirect("index.php?module=user-users");
Zeile 930	Zeile 928
$page->extra_header .= <<<EOF	$page->extra_header .= <<<EOF
<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?ver=1805"></script> <script type="text/javascript" src="../jscripts/bbcodes_sceditor.js?ver=1808"></script> <script type="text/javascript" src="../jscripts/sceditor/editor_plugins/undo.js?ver=1805"></script>	<link rel="stylesheet" href="../jscripts/sceditor/themes/mybb.css" type="text/css" media="all" /> <script type="text/javascript" src="../jscripts/sceditor/jquery.sceditor.bbcode.min.js?ver=1822"></script> <script type="text/javascript" src="../jscripts/bbcodes_sceditor.js?ver=1822"></script> <script type="text/javascript" src="../jscripts/sceditor/plugins/undo.js?ver=1805"></script>
EOF; $page->output_header($lang->edit_user);	EOF; $page->output_header($lang->edit_user);
Zeile 955	Zeile 953
// Is this user a COPPA user? We show a warning & activate link if($user['coppauser']) {	// Is this user a COPPA user? We show a warning & activate link if($user['coppauser']) {
echo $lang->sprintf($lang->warning_coppa_user, $user['uid']);	echo $lang->sprintf($lang->warning_coppa_user, $user['uid'], $mybb->post_code);
} $tabs = array(	} $tabs = array(
Zeile 978	Zeile 976
$table->construct_header($lang->general_account_stats, array('colspan' => '2', 'class' => 'align_center')); // Avatar	$table->construct_header($lang->general_account_stats, array('colspan' => '2', 'class' => 'align_center')); // Avatar
$avatar_dimensions = explode("\|", $user['avatardimensions']);	$avatar_dimensions = preg_split('/[\|x]/', $user['avatardimensions']); if($user['avatardimensions']) { require_once MYBB_ROOT."inc/functions_image.php"; list($width, $height) = preg_split('/[\|x]/', $user['avatardimensions']); $scaled_dimensions = scale_image($width, $height, 120, 120); } else { $scaled_dimensions = array( "width" => 120, "height" => 120 ); }
if($user['avatar'] && (my_strpos($user['avatar'], '://') === false \|\| $mybb->settings['allowremoteavatars'])) {	if($user['avatar'] && (my_strpos($user['avatar'], '://') === false \|\| $mybb->settings['allowremoteavatars'])) {
if($user['avatardimensions'])	if(!my_validate_url($user['avatar']))
{	{
require_once MYBB_ROOT."inc/functions_image.php"; list($width, $height) = explode("\|", $user['avatardimensions']); $scaled_dimensions = scale_image($width, $height, 120, 120); } else { $scaled_dimensions = array( "width" => 120, "height" => 120 ); } if(!my_validate_url($user['avatar'])) { $user['avatar'] = "../{$user['avatar']}\n";	$avatar = format_avatar($user['avatar'], $user['avatardimensions']); $user['avatar'] = $avatar['image'];
} } else { if(my_validate_url($mybb->settings['useravatar']))	} } else { if(my_validate_url($mybb->settings['useravatar']))
{	{
$user['avatar'] = str_replace('{theme}', 'images', $mybb->settings['useravatar']); } else { $user['avatar'] = "../".str_replace('{theme}', 'images', $mybb->settings['useravatar']); }	$user['avatar'] = str_replace('{theme}', 'images', $mybb->settings['useravatar']); } else { $user['avatar'] = "../".str_replace('{theme}', 'images', $mybb->settings['useravatar']); }
$scaled_dimensions = array( "width" => 120, "height" => 120 ); }	}
$avatar_top = ceil((126-$scaled_dimensions['height'])/2);	$avatar_top = ceil((126-$scaled_dimensions['height'])/2);
if($user['lastactive']) { $last_active = my_date('relative', $user['lastactive']); } else {	$last_seen = max(array($user['lastactive'], $user['lastvisit'])); if(!empty($last_seen)) { $last_active = my_date('relative', $last_seen); } else {
$last_active = $lang->never; } $reg_date = my_date('relative', $user['regdate']);	$last_active = $lang->never; } $reg_date = my_date('relative', $user['regdate']);
Zeile 1039	Zeile 1035
$days_registered = (TIME_NOW - $user['regdate']) / (24*3600); $posts_per_day = 0; if($days_registered > 0)	$days_registered = (TIME_NOW - $user['regdate']) / (24*3600); $posts_per_day = 0; if($days_registered > 0)
{	{
$posts_per_day = round($user['postnum'] / $days_registered, 2); if($posts_per_day > $user['postnum']) {	$posts_per_day = round($user['postnum'] / $days_registered, 2); if($posts_per_day > $user['postnum']) {
Zeile 1057	Zeile 1053
else { $percent_posts = round($user['postnum']*100/$posts, 2);	else { $percent_posts = round($user['postnum']*100/$posts, 2);
} $user_permissions = user_permissions($user['uid']);	} $user_permissions = user_permissions($user['uid']);
// Fetch the reputation for this user if($user_permissions['usereputationsystem'] == 1 && $mybb->settings['enablereputation'] == 1) { $reputation = get_reputation($user['reputation']);	// Fetch the reputation for this user if($user_permissions['usereputationsystem'] == 1 && $mybb->settings['enablereputation'] == 1) { $reputation = get_reputation($user['reputation']);
}	}
else { $reputation = "-";	else { $reputation = "-";
Zeile 1090	Zeile 1086
if($user['birthday']) { $age = get_age($user['birthday']);	if($user['birthday']) { $age = get_age($user['birthday']);
}	}
$postnum = my_number_format($user['postnum']);	$postnum = my_number_format($user['postnum']);
Zeile 1163	Zeile 1159
$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', 'min' => 0)), 'icq');	$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', '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->google_handle, "", $form->generate_text_box('google', $mybb->input['google'], array('id' => 'google')), 'google');	$form_container->output_row($lang->skype_handle, "", $form->generate_text_box('skype', $mybb->input['skype'], array('id' => 'skype')), 'skype'); $form_container->output_row($lang->google_handle, "", $form->generate_text_box('google', $mybb->input['google'], array('id' => 'google')), 'google');
Zeile 1194	Zeile 1188
$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: 4em;', 'min' => 0));	$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: 4em;', 'min' => 0));

$form_container->output_row($lang->birthday, "", $birthday_row, 'birthday'); // Output custom profile fields - optional output_custom_profile_fields($profile_fields['optional'], $mybb->input['profile_fields'], $form_container, $form);	$form_container->output_row($lang->birthday, "", $birthday_row, 'birthday'); // Output custom profile fields - optional output_custom_profile_fields($profile_fields['optional'], $mybb->input['profile_fields'], $form_container, $form);

$form_container->end();	$form_container->end();
Zeile 1230	Zeile 1224
// // ACCOUNT SETTINGS //	// // ACCOUNT SETTINGS //
// Plugin hook note - we should add hooks in above each output_row for the below so users can add their own options to each group :>
echo "<div id=\"tab_settings\">\n"; $form_container = new FormContainer($lang->account_settings.': '.htmlspecialchars_uni($user['username']));	echo "<div id=\"tab_settings\">\n"; $form_container = new FormContainer($lang->account_settings.': '.htmlspecialchars_uni($user['username']));
Zeile 1254	Zeile 1246
$form->generate_check_box("pmnotify", 1, $lang->email_notify_new_pms, array("checked" => $mybb->input['pmnotify'])), $form->generate_check_box("buddyrequestspm", 1, $lang->buddy_requests_pm, array("checked" => $mybb->input['buddyrequestspm'])), $form->generate_check_box("buddyrequestsauto", 1, $lang->buddy_requests_auto, array("checked" => $mybb->input['buddyrequestsauto'])),	$form->generate_check_box("pmnotify", 1, $lang->email_notify_new_pms, array("checked" => $mybb->input['pmnotify'])), $form->generate_check_box("buddyrequestspm", 1, $lang->buddy_requests_pm, array("checked" => $mybb->input['buddyrequestspm'])), $form->generate_check_box("buddyrequestsauto", 1, $lang->buddy_requests_auto, array("checked" => $mybb->input['buddyrequestsauto'])),
"<label for=\"subscriptionmethod\">{$lang->default_thread_subscription_mode}:</label><br />".$form->generate_select_box("subscriptionmethod", array($lang->do_not_subscribe, $lang->no_email_notification, $lang->instant_email_notification), $mybb->input['subscriptionmethod'], array('id' => 'subscriptionmethod'))	"<label for=\"subscriptionmethod\">{$lang->default_thread_subscription_mode}:</label><br />".$form->generate_select_box("subscriptionmethod", array($lang->do_not_subscribe, $lang->no_notification, $lang->instant_email_notification, $lang->instant_pm_notification), $mybb->input['subscriptionmethod'], array('id' => 'subscriptionmethod'))
);	);
	// Allow plugins to add messaging options $messaging_options = $plugins->run_hooks('admin_user_users_edit_messaging_options', $messaging_options); // Output messaging options
$form_container->output_row($lang->messaging_and_notification, "", "<div class=\"user_settings_bit\">".implode("</div><div class=\"user_settings_bit\">", $messaging_options)."</div>"); $date_format_options = array($lang->use_default); foreach($date_formats as $key => $format)	$form_container->output_row($lang->messaging_and_notification, "", "<div class=\"user_settings_bit\">".implode("</div><div class=\"user_settings_bit\">", $messaging_options)."</div>"); $date_format_options = array($lang->use_default); foreach($date_formats as $key => $format)
{	{
$date_format_options[$key] = my_date($format, TIME_NOW, "", 0);	$date_format_options[$key] = my_date($format, TIME_NOW, "", 0);
}	}
$time_format_options = array($lang->use_default); foreach($time_formats as $key => $format) {	$time_format_options = array($lang->use_default); foreach($time_formats as $key => $format) {
Zeile 1276	Zeile 1273
"<label for=\"timezone\">{$lang->time_zone}:</label><br />".build_timezone_select("timezone", $mybb->input['timezone']), "<label for=\"dstcorrection\">{$lang->daylight_savings_time_correction}:</label><br />".$form->generate_select_box("dstcorrection", array(2 => $lang->automatically_detect, 1 => $lang->always_use_dst_correction, 0 => $lang->never_use_dst_correction), $mybb->input['dstcorrection'], array('id' => 'dstcorrection')) );	"<label for=\"timezone\">{$lang->time_zone}:</label><br />".build_timezone_select("timezone", $mybb->input['timezone']), "<label for=\"dstcorrection\">{$lang->daylight_savings_time_correction}:</label><br />".$form->generate_select_box("dstcorrection", array(2 => $lang->automatically_detect, 1 => $lang->always_use_dst_correction, 0 => $lang->never_use_dst_correction), $mybb->input['dstcorrection'], array('id' => 'dstcorrection')) );
	// Allow plugins to add date options $date_options = $plugins->run_hooks('admin_user_users_edit_date_options', $date_options); // Output date options
$form_container->output_row($lang->date_and_time_options, "", "<div class=\"user_settings_bit\">".implode("</div><div class=\"user_settings_bit\">", $date_options)."</div>");	$form_container->output_row($lang->date_and_time_options, "", "<div class=\"user_settings_bit\">".implode("</div><div class=\"user_settings_bit\">", $date_options)."</div>");
Zeile 1310	Zeile 1312
"<label for=\"tpp\">{$lang->threads_per_page}:</label><br />".$form->generate_select_box("tpp", $tpp_options, $mybb->input['tpp'], array('id' => 'tpp')), "<label for=\"daysprune\">{$lang->default_thread_age_view}:</label><br />".$form->generate_select_box("daysprune", $thread_age_options, $mybb->input['daysprune'], array('id' => 'daysprune')) );	"<label for=\"tpp\">{$lang->threads_per_page}:</label><br />".$form->generate_select_box("tpp", $tpp_options, $mybb->input['tpp'], array('id' => 'tpp')), "<label for=\"daysprune\">{$lang->default_thread_age_view}:</label><br />".$form->generate_select_box("daysprune", $thread_age_options, $mybb->input['daysprune'], array('id' => 'daysprune')) );
	// Allow plugins to add forum options $forum_options = $plugins->run_hooks('admin_user_users_edit_forum_options', $forum_options); // Output forum options
$form_container->output_row($lang->forum_display_options, "", "<div class=\"user_settings_bit\">".implode("</div><div class=\"user_settings_bit\">", $forum_options)."</div>"); $ppp_options = array($lang->use_default);	$form_container->output_row($lang->forum_display_options, "", "<div class=\"user_settings_bit\">".implode("</div><div class=\"user_settings_bit\">", $forum_options)."</div>"); $ppp_options = array($lang->use_default);
Zeile 1336	Zeile 1343
"<label for=\"ppp\">{$lang->posts_per_page}:</label><br />".$form->generate_select_box("ppp", $ppp_options, $mybb->input['ppp'], array('id' => 'ppp')), "<label for=\"threadmode\">{$lang->default_thread_view_mode}:</label><br />".$form->generate_select_box("threadmode", array("" => $lang->use_default, "linear" => $lang->linear_mode, "threaded" => $lang->threaded_mode), $mybb->input['threadmode'], array('id' => 'threadmode')) );	"<label for=\"ppp\">{$lang->posts_per_page}:</label><br />".$form->generate_select_box("ppp", $ppp_options, $mybb->input['ppp'], array('id' => 'ppp')), "<label for=\"threadmode\">{$lang->default_thread_view_mode}:</label><br />".$form->generate_select_box("threadmode", array("" => $lang->use_default, "linear" => $lang->linear_mode, "threaded" => $lang->threaded_mode), $mybb->input['threadmode'], array('id' => 'threadmode')) );
$form_container->output_row($lang->thread_view_options, "", "<div class=\"user_settings_bit\">".implode("</div><div class=\"user_settings_bit\">", $thread_options)."</div>");	// Allow plugins to add thread options $thread_options = $plugins->run_hooks('admin_user_users_edit_thread_options', $thread_options); // Output thread options $form_container->output_row($lang->thread_view_options, "", "<div class=\"user_settings_bit\">".implode("</div><div class=\"user_settings_bit\">", $thread_options)."</div>");
$languages = array_merge(array('' => $lang->use_default), $lang->get_languages());	$languages = array_merge(array('' => $lang->use_default), $lang->get_languages());
Zeile 1347	Zeile 1359
"<label for=\"style\">{$lang->theme}:</label><br />".build_theme_select("style", $mybb->input['style'], 0, "", true, false, true), "<label for=\"language\">{$lang->board_language}:</label><br />".$form->generate_select_box("language", $languages, $mybb->input['language'], array('id' => 'language')) );	"<label for=\"style\">{$lang->theme}:</label><br />".build_theme_select("style", $mybb->input['style'], 0, "", true, false, true), "<label for=\"language\">{$lang->board_language}:</label><br />".$form->generate_select_box("language", $languages, $mybb->input['language'], array('id' => 'language')) );
	// Allow plugins to add other options $other_options = $plugins->run_hooks('admin_user_users_edit_other_options', $other_options); // Output other options
$form_container->output_row($lang->other_options, "", "<div class=\"user_settings_bit\">".implode("</div><div class=\"user_settings_bit\">", $other_options)."</div>"); $form_container->end();	$form_container->output_row($lang->other_options, "", "<div class=\"user_settings_bit\">".implode("</div><div class=\"user_settings_bit\">", $other_options)."</div>"); $form_container->end();
Zeile 1400	Zeile 1417
{ // Permanent $lang->suspend_expire_info = $lang->suspend_sig_perm;	{ // Permanent $lang->suspend_expire_info = $lang->suspend_sig_perm;
}	}
else { // There's a limit to the suspension!	else { // There's a limit to the suspension!
Zeile 1515	Zeile 1532
if($mybb->settings['maxavatardims'] != "") {	if($mybb->settings['maxavatardims'] != "") {
list($max_width, $max_height) = explode("x", my_strtolower($mybb->settings['maxavatardims']));	list($max_width, $max_height) = preg_split('/[\|x]/', my_strtolower($mybb->settings['maxavatardims']));
$max_size = "<br />{$lang->max_dimensions_are} {$max_width}x{$max_height}"; }	$max_size = "<br />{$lang->max_dimensions_are} {$max_width}x{$max_height}"; }
Zeile 1764	Zeile 1781
$plugins->run_hooks("admin_user_users_delete_commit_end");	$plugins->run_hooks("admin_user_users_delete_commit_end");
log_admin_action($user['uid'], htmlspecialchars_uni($user['username']));	log_admin_action($user['uid'], $user['username']);
flash_message($lang->success_user_deleted, 'success'); admin_redirect("index.php?module=user-users");	flash_message($lang->success_user_deleted, 'success'); admin_redirect("index.php?module=user-users");
Zeile 1844	Zeile 1861
$user = $db->fetch_array($query); // Log admin action	$user = $db->fetch_array($query); // Log admin action
log_admin_action($user['uid'], htmlspecialchars_uni($user['username']));	log_admin_action($user['uid'], $user['username']);
$table = new Table;	$table = new Table;
Zeile 1920	Zeile 1937
if($mybb->request_method == "post") {	if($mybb->request_method == "post") {
$source_user = get_user_by_username($mybb->input['source_username'], array('fields' => '*')); if(!$source_user['uid'])	foreach(array('source', 'destination') as $target)
{	{
$errors[] = $lang->error_invalid_user_source; } $destination_user = get_user_by_username($mybb->input['destination_username'], array('fields' => '*')); if(!$destination_user['uid']) { $errors[] = $lang->error_invalid_user_destination;	${$target.'_user'} = get_user_by_username($mybb->input[$target.'_username'], array('fields' => '*')); if(!${$target.'_user'}['uid']) { $errors[] = $lang->{'error_invalid_user_'.$target}; }
} // If we're not a super admin and we're merging a source super admin or a destination super admin then dissallow this action	} // If we're not a super admin and we're merging a source super admin or a destination super admin then dissallow this action
Zeile 1937	Zeile 1951
{ flash_message($lang->error_no_perms_super_admin, 'error'); admin_redirect("index.php?module=user-users");	{ flash_message($lang->error_no_perms_super_admin, 'error'); admin_redirect("index.php?module=user-users");
} if($source_user['uid'] == $destination_user['uid']) {	} if($source_user['uid'] == $destination_user['uid'] && !empty($source_user['uid'])) {
$errors[] = $lang->error_cannot_merge_same_account; }	$errors[] = $lang->error_cannot_merge_same_account; }
Zeile 1980	Zeile 1994
// Banning $db->update_query("banned", array('admin' => $destination_user['uid']), "admin = '{$source_user['uid']}'");	// Banning $db->update_query("banned", array('admin' => $destination_user['uid']), "admin = '{$source_user['uid']}'");
	// Carry over referrals $db->update_query("users", array("referrer" => ((int)$source_user['referrer'] + (int)$destination_user['referrer'])), "uid='{$destination_user['uid']}'"); $db->update_query("users", array("referrals" => ((int)$source_user['referrals'] + (int)$destination_user['referrals'])), "uid='{$destination_user['uid']}'");
// Merging Reputation // First, let's change all the details over to our new user...	// Merging Reputation // First, let's change all the details over to our new user...
Zeile 2141	Zeile 2159
$cache->update_awaitingactivation(); // Log admin action	$cache->update_awaitingactivation(); // Log admin action
log_admin_action($source_user['uid'], htmlspecialchars_uni($source_user['username']), $destination_user['uid'], htmlspecialchars_uni($destination_user['username']));	log_admin_action($source_user['uid'], $source_user['username'], $destination_user['uid'], $destination_user['username']);
// Redirect! $username = htmlspecialchars_uni($source_user['username']);	// Redirect! $username = htmlspecialchars_uni($source_user['username']);
Zeile 2469	Zeile 2487
$to_update_count = count($to_update); $lang->inline_activated = $lang->sprintf($lang->inline_activated, my_number_format($to_update_count));	$to_update_count = count($to_update); $lang->inline_activated = $lang->sprintf($lang->inline_activated, my_number_format($to_update_count));
if($to_update_count != count($selected))	if(is_array($selected) && $to_update_count != count($selected))
{ // The update count is different to how many we selected! $not_updated_count = count($selected) - $to_update_count;	{ // The update count is different to how many we selected! $not_updated_count = count($selected) - $to_update_count;
Zeile 2631	Zeile 2649
$table->output($lang->important); // If there's any errors, display inline	$table->output($lang->important); // If there's any errors, display inline
if($errors) { $page->output_inline_error($errors);	if($errors) { $page->output_inline_error($errors);
} $form = new Form("index.php?module=user-users", "post"); echo $form->generate_hidden_field('action', 'inline_edit'); echo $form->generate_hidden_field('inline_action', 'multiban'); echo $form->generate_hidden_field('processed', '1');	} $form = new Form("index.php?module=user-users", "post"); echo $form->generate_hidden_field('action', 'inline_edit'); echo $form->generate_hidden_field('inline_action', 'multiban'); echo $form->generate_hidden_field('processed', '1');

$form_container = new FormContainer('<div class="float_right"><a href="index.php?module=user-users&action=inline_edit&inline_action=multilift&my_post_key='.$mybb->post_code.'">'.$lang->lift_bans.'</a></div>'.$lang->mass_ban); $form_container->output_row($lang->ban_reason, "", $form->generate_text_area('reason', $mybb->input['reason'], array('id' => 'reason', 'maxlength' => '255')), 'reason'); $ban_times = fetch_ban_times();	$form_container = new FormContainer('<div class="float_right"><a href="index.php?module=user-users&action=inline_edit&inline_action=multilift&my_post_key='.$mybb->post_code.'">'.$lang->lift_bans.'</a></div>'.$lang->mass_ban); $form_container->output_row($lang->ban_reason, "", $form->generate_text_area('reason', $mybb->input['reason'], array('id' => 'reason', 'maxlength' => '255')), 'reason'); $ban_times = fetch_ban_times();
Zeile 2684	Zeile 2702
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();	$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);
}	}
$to_be_deleted = count($selected); $lang->confirm_multidelete = $lang->sprintf($lang->confirm_multidelete, my_number_format($to_be_deleted)); $page->output_confirm_action("index.php?module=user-users&action=inline_edit&inline_action=multidelete&my_post_key={$mybb->post_code}&processed=1", $lang->confirm_multidelete);	$to_be_deleted = count($selected); $lang->confirm_multidelete = $lang->sprintf($lang->confirm_multidelete, my_number_format($to_be_deleted)); $page->output_confirm_action("index.php?module=user-users&action=inline_edit&inline_action=multidelete&my_post_key={$mybb->post_code}&processed=1", $lang->confirm_multidelete);
Zeile 2702	Zeile 2720
if(($mybb->input['day'] \|\| $mybb->input['month'] \|\| $mybb->input['year']) && $mybb->input['set']) { $errors[] = $lang->multi_selected_dates;	if(($mybb->input['day'] \|\| $mybb->input['month'] \|\| $mybb->input['year']) && $mybb->input['set']) { $errors[] = $lang->multi_selected_dates;
}	}
$day = $mybb->get_input('day', MyBB::INPUT_INT); $month = $mybb->get_input('month', MyBB::INPUT_INT);	$day = $mybb->get_input('day', MyBB::INPUT_INT); $month = $mybb->get_input('month', MyBB::INPUT_INT);
Zeile 2713	Zeile 2731
{ // Is the date sort of valid? if($day < 1 \|\| $day > 31 \|\| $month < 1 \|\| $month > 12 \|\| ($month == 2 && $day > 29))	{ // Is the date sort of valid? if($day < 1 \|\| $day > 31 \|\| $month < 1 \|\| $month > 12 \|\| ($month == 2 && $day > 29))
{ $errors[] = $lang->incorrect_date; }	{ $errors[] = $lang->incorrect_date; }
// Check the month $months = get_bdays($year); if($day > $months[$month-1])	// Check the month $months = get_bdays($year); if($day > $months[$month-1])
{ $errors[] = $lang->incorrect_date;	{ $errors[] = $lang->incorrect_date;
} // Check the year	} // Check the year
Zeile 2734	Zeile 2752
{ // No errors, so let's continue and set the date to delete from $date = mktime(date('H'), date('i'), date('s'), $month, $day, $year); // Generate a unix time stamp	{ // No errors, so let's continue and set the date to delete from $date = mktime(date('H'), date('i'), date('s'), $month, $day, $year); // Generate a unix time stamp
} }	} }
elseif($mybb->input['set'] > 0) { // Set options	elseif($mybb->input['set'] > 0) { // Set options
Zeile 2837	Zeile 2855
// After updating thread counters, update the affected forum counters if(is_array($prune_array['forum_update']) && count($prune_array['forum_update']) > 0)	// After updating thread counters, update the affected forum counters if(is_array($prune_array['forum_update']) && count($prune_array['forum_update']) > 0)
{	{
$sql_array = implode(",", $prune_array['forum_update']); $query = $db->simple_select("forums", "fid", "fid IN (".$sql_array.")", array('order_by' => 'fid', 'order_dir' => 'asc')); while($forum = $db->fetch_array($query))	$sql_array = implode(",", $prune_array['forum_update']); $query = $db->simple_select("forums", "fid", "fid IN (".$sql_array.")", array('order_by' => 'fid', 'order_dir' => 'asc')); while($forum = $db->fetch_array($query))
Zeile 2857	Zeile 2875
flash_message($lang->prune_complete, 'success'); admin_redirect("index.php?module=user-users".$vid_url); }	flash_message($lang->prune_complete, 'success'); admin_redirect("index.php?module=user-users".$vid_url); }
}	}
$page->output_header($lang->manage_users); $page->output_nav_tabs($sub_tabs, 'manage_users');	$page->output_header($lang->manage_users); $page->output_nav_tabs($sub_tabs, 'manage_users');
Zeile 2888	Zeile 2906
for($i = 1; $i <= 31; ++$i) { $day_options[] = $i;	for($i = 1; $i <= 31; ++$i) { $day_options[] = $i;
}	}
// Generate a list of months (1 - 12) $month_options = array(); $month_options[] = " "; for($i = 1; $i <= 12; ++$i)	// Generate a list of months (1 - 12) $month_options = array(); $month_options[] = " "; for($i = 1; $i <= 12; ++$i)
{	{
$string = "month_{$i}"; $month_options[] = $lang->$string; }	$string = "month_{$i}"; $month_options[] = $lang->$string; }
Zeile 2937	Zeile 2955
} $additionalgroups = implode(",", array_map('intval', $mybb->input['additionalgroups']));	} $additionalgroups = implode(",", array_map('intval', $mybb->input['additionalgroups']));
} else {	} else {
$additionalgroups = ''; }	$additionalgroups = ''; }
Zeile 2952	Zeile 2970
// Do the usergroup update for all those selected // If the a selected user is a super admin, don't update that user	// Do the usergroup update for all those selected // If the a selected user is a super admin, don't update that user
	$users_to_update = array();
foreach($selected as $user) { if(!is_super_admin($user))	foreach($selected as $user) { if(!is_super_admin($user))
Zeile 2961	Zeile 2980
} $to_update_count = count($users_to_update);	} $to_update_count = count($users_to_update);
if($to_update_count > 0 && is_array($users_to_update))	if($to_update_count > 0)
{ // Update the users in the database $sql = implode(",", $users_to_update);	{ // Update the users in the database $sql = implode(",", $users_to_update);
Zeile 3041	Zeile 3060
echo "<script type=\"text/javascript\" src=\"jscripts/users.js\"></script>"; $page->output_nav_tabs($sub_tabs, 'browse_users');	echo "<script type=\"text/javascript\" src=\"jscripts/users.js\"></script>"; $page->output_nav_tabs($sub_tabs, 'browse_users');

if(isset($mybb->input['search_id']) && $admin_session['data']['user_views'][$mybb->input['search_id']]) { $admin_view = $admin_session['data']['user_views'][$mybb->input['search_id']];	if(isset($mybb->input['search_id']) && $admin_session['data']['user_views'][$mybb->input['search_id']]) { $admin_view = $admin_session['data']['user_views'][$mybb->input['search_id']];
Zeile 3237	Zeile 3256
// Build the search SQL for users // List of valid LIKE search fields	// Build the search SQL for users // List of valid LIKE search fields
$user_like_fields = array("username", "email", "website", "icq", "aim", "yahoo", "skype", "google", "signature", "usertitle");	$user_like_fields = array("username", "email", "website", "icq", "skype", "google", "signature", "usertitle");
foreach($user_like_fields as $search_field) { if(!empty($view['conditions'][$search_field]) && !$view['conditions'][$search_field.'_blank'])	foreach($user_like_fields as $search_field) { if(!empty($view['conditions'][$search_field]) && !$view['conditions'][$search_field.'_blank'])
Zeile 3478	Zeile 3497
if($mybb->input['page']) { $start = ($mybb->input['page'] - 1) * $view['perpage'];	if($mybb->input['page']) { $start = ($mybb->input['page'] - 1) * $view['perpage'];
	$pages = ceil($num_results / $view['perpage']); if($mybb->input['page'] > $pages) { $start = 0; $mybb->input['page'] = 1; }
} else {	} else {
Zeile 3551	Zeile 3576
$user['view']['additionalgroups'] = "<small>{$groups_list}</small>"; $user['view']['email'] = "<a href=\"mailto:".htmlspecialchars_uni($user['email'])."\">".htmlspecialchars_uni($user['email'])."</a>"; $user['view']['regdate'] = my_date('relative', $user['regdate']);	$user['view']['additionalgroups'] = "<small>{$groups_list}</small>"; $user['view']['email'] = "<a href=\"mailto:".htmlspecialchars_uni($user['email'])."\">".htmlspecialchars_uni($user['email'])."</a>"; $user['view']['regdate'] = my_date('relative', $user['regdate']);
$user['view']['lastactive'] = my_date('relative', $user['lastactive']);	$last_seen = max(array($user['lastactive'], $user['lastvisit'])); if(!empty($last_seen)) { $user['view']['lastactive'] = my_date('relative', $last_seen); } else { $user['view']['lastactive'] = $lang->never; }
// Build popup menu $popup = new PopupMenu("user_{$user['uid']}", $lang->options);	// Build popup menu $popup = new PopupMenu("user_{$user['uid']}", $lang->options);
Zeile 3604	Zeile 3637
if($mybb->settings['maxwarningpoints'] < 1) { $mybb->settings['maxwarningpoints'] = 10;	if($mybb->settings['maxwarningpoints'] < 1) { $mybb->settings['maxwarningpoints'] = 10;
}	}
$warning_level = round($user['warningpoints']/$mybb->settings['maxwarningpoints']*100); if($warning_level > 100)	$warning_level = round($user['warningpoints']/$mybb->settings['maxwarningpoints']*100); if($warning_level > 100)
Zeile 3667	Zeile 3700
else { $switch_view .= "<a href=\"{$switch_url}&type=table\" style=\"font-weight: normal;\">{$lang->table_view}</a> \| <strong>{$lang->card_view}</strong>";	else { $switch_view .= "<a href=\"{$switch_url}&type=table\" style=\"font-weight: normal;\">{$lang->table_view}</a> \| <strong>{$lang->card_view}</strong>";
}	}
$switch_view .= "</div>"; // Do we need to construct the pagination?	$switch_view .= "</div>"; // Do we need to construct the pagination?
Zeile 3713	Zeile 3746
} $built_view .= "<script type=\"text/javascript\"> var form = $(\"#search_form\");	} $built_view .= "<script type=\"text/javascript\"> var form = $(\"#search_form\");
form.submit(function() {	form.on('submit', function() {
var search = $('#search_keywords'); if(search.val() == '' \|\| search.val() == '".addcslashes($lang->search_for_user, "'")."') {	var search = $('#search_keywords'); if(search.val() == '' \|\| search.val() == '".addcslashes($lang->search_for_user, "'")."') {
search.focus();	search.trigger('focus');
return false; } }); var search = $(\"#search_keywords\");	return false; } }); var search = $(\"#search_keywords\");
search.focus(function()	search.on('focus', function()
{ var searched_focus = $(this); if(searched_focus.val() == '".addcslashes($lang->search_for_user, "'")."')	{ var searched_focus = $(this); if(searched_focus.val() == '".addcslashes($lang->search_for_user, "'")."')
Zeile 3731	Zeile 3764
searched_focus.removeClass(\"search_default\"); searched_focus.val(\"\"); }	searched_focus.removeClass(\"search_default\"); searched_focus.val(\"\"); }
}); search.blur(function()	}).on('blur', function()
{ var searched_blur = $(this); if(searched_blur.val() == \"\")	{ var searched_blur = $(this); if(searched_blur.val() == \"\")
Zeile 3775	Zeile 3806
} $built_view .= '	} $built_view .= '
<script type="text/javascript" src="'.$mybb->settings['bburl'].'/jscripts/inline_moderation.js?ver=1800"></script>	<script type="text/javascript" src="'.$mybb->settings['bburl'].'/jscripts/inline_moderation.js?ver=1821"></script>
<form action="index.php?module=user-users" method="post"> <input type="hidden" name="my_post_key" value="'.$mybb->post_code.'" /> <input type="hidden" name="action" value="inline_edit" />	<form action="index.php?module=user-users" method="post"> <input type="hidden" name="my_post_key" value="'.$mybb->post_code.'" /> <input type="hidden" name="action" value="inline_edit" />
Zeile 3959	Zeile 3990
switch($type) { case "multiselect":	switch($type) { case "multiselect":
	$selected_options = array();
if(!is_array($values[$field_name])) { $user_options = explode("\n", $values[$field_name]);	if(!is_array($values[$field_name])) { $user_options = explode("\n", $values[$field_name]);
Zeile 3966	Zeile 3998
else { $user_options = $values[$field_name];	else { $user_options = $values[$field_name];
} $selected_options = array();	}
foreach($user_options as $val) { $selected_options[$val] = htmlspecialchars_uni($val);	foreach($user_options as $val) { $selected_options[$val] = htmlspecialchars_uni($val);
}	}
$select_options = explode("\n", $options); $options = array();	$select_options = explode("\n", $options); $options = array();
if($search == true) { $select_options[''] = $lang->na;	if($search == true) { $select_options[''] = $lang->na;
} foreach($select_options as $val)	} foreach($select_options as $val)
Zeile 3997	Zeile 4029
if($search == true) { $select_options[''] = $lang->na;	if($search == true) { $select_options[''] = $lang->na;
}	}
$select_options += explode("\n", $options); $options = array(); foreach($select_options as $val)	$select_options += explode("\n", $options); $options = array(); foreach($select_options as $val)
Zeile 4012	Zeile 4044
if($search == true) { $code = $form->generate_select_box("profile_fields[{$field_name}][{$field_name}]", $options, htmlspecialchars_uni($values[$field_name]), array('id' => "profile_field_{$field_name}", 'size' => $profile_field['length']));	if($search == true) { $code = $form->generate_select_box("profile_fields[{$field_name}][{$field_name}]", $options, htmlspecialchars_uni($values[$field_name]), array('id' => "profile_field_{$field_name}", 'size' => $profile_field['length']));
}	}
else { $code = $form->generate_select_box("profile_fields[{$field_name}]", $options, htmlspecialchars_uni($values[$field_name]), array('id' => "profile_field_{$field_name}", 'size' => $profile_field['length']));	else { $code = $form->generate_select_box("profile_fields[{$field_name}]", $options, htmlspecialchars_uni($values[$field_name]), array('id' => "profile_field_{$field_name}", 'size' => $profile_field['length']));
} break;	} break;
case "radio": $radio_options = array(); if($search == true)	case "radio": $radio_options = array(); if($search == true)
Zeile 4027	Zeile 4059
$radio_options += explode("\n", $options); $code = ''; foreach($radio_options as $val)	$radio_options += explode("\n", $options); $code = ''; foreach($radio_options as $val)
{	{
$val = trim($val); $code .= $form->generate_radio_button("profile_fields[{$field_name}]", $val, htmlspecialchars_uni($val), array('id' => "profile_field_{$field_name}", 'checked' => ($val == $values[$field_name] ? true : false)))."<br />"; } break; case "checkbox":	$val = trim($val); $code .= $form->generate_radio_button("profile_fields[{$field_name}]", $val, htmlspecialchars_uni($val), array('id' => "profile_field_{$field_name}", 'checked' => ($val == $values[$field_name] ? true : false)))."<br />"; } break; case "checkbox":
	$select_options = array();
if(!is_array($values[$field_name])) { $user_options = explode("\n", $values[$field_name]);	if(!is_array($values[$field_name])) { $user_options = explode("\n", $values[$field_name]);
}	}
else	else
{	{
$user_options = $values[$field_name];	$user_options = $values[$field_name];
}	} $selected_options = array();
foreach($user_options as $val) { $selected_options[$val] = $val; }	foreach($user_options as $val) { $selected_options[$val] = $val; }
$select_options = array();
if($search == true) { $select_options[''] = $lang->na;	if($search == true) { $select_options[''] = $lang->na;
Zeile 4114	Zeile 4149
$form_container = new FormContainer($lang->find_users_where); $form_container->output_row($lang->username_contains, "", $form->generate_text_box('conditions[username]', htmlspecialchars_uni($input['conditions']['username']), array('id' => 'username')), 'username'); $form_container->output_row($lang->email_address_contains, "", $form->generate_text_box('conditions[email]', $input['conditions']['email'], array('id' => 'email')), 'email');	$form_container = new FormContainer($lang->find_users_where); $form_container->output_row($lang->username_contains, "", $form->generate_text_box('conditions[username]', htmlspecialchars_uni($input['conditions']['username']), array('id' => 'username')), 'username'); $form_container->output_row($lang->email_address_contains, "", $form->generate_text_box('conditions[email]', $input['conditions']['email'], array('id' => 'email')), 'email');

$options = array(); $query = $db->simple_select("usergroups", "gid, title", "gid != '1'", array('order_by' => 'title')); while($usergroup = $db->fetch_array($query))	$options = array(); $query = $db->simple_select("usergroups", "gid, title", "gid != '1'", array('order_by' => 'title')); while($usergroup = $db->fetch_array($query))
Zeile 4126	Zeile 4161
$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_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->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_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->google_contains, "", $form->generate_text_box('conditions[google]', $input['conditions']['google'], array('id' => 'google'))." {$lang->or} ".$form->generate_check_box('conditions[google_blank]', 1, $lang->is_not_blank, array('id' => 'google_blank', 'checked' => $input['conditions']['google_blank'])), 'google'); $form_container->output_row($lang->signature_contains, "", $form->generate_text_box('conditions[signature]', $input['conditions']['signature'], array('id' => 'signature'))." {$lang->or} ".$form->generate_check_box('conditions[signature_blank]', 1, $lang->is_not_blank, array('id' => 'signature_blank', 'checked' => $input['conditions']['signature_blank'])), 'signature');	$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->google_contains, "", $form->generate_text_box('conditions[google]', $input['conditions']['google'], array('id' => 'google'))." {$lang->or} ".$form->generate_check_box('conditions[google_blank]', 1, $lang->is_not_blank, array('id' => 'google_blank', 'checked' => $input['conditions']['google_blank'])), 'google'); $form_container->output_row($lang->signature_contains, "", $form->generate_text_box('conditions[signature]', $input['conditions']['signature'], array('id' => 'signature'))." {$lang->or} ".$form->generate_check_box('conditions[signature_blank]', 1, $lang->is_not_blank, array('id' => 'signature_blank', 'checked' => $input['conditions']['signature_blank'])), 'signature');
Zeile 4146	Zeile 4179
$form_container->output_row($lang->posted_with_ip, $lang->wildcard, $form->generate_text_box('conditions[postip]', $input['conditions']['postip'], array('id' => 'postip')), 'postip'); $form_container->end();	$form_container->output_row($lang->posted_with_ip, $lang->wildcard, $form->generate_text_box('conditions[postip]', $input['conditions']['postip'], array('id' => 'postip')), 'postip'); $form_container->end();

// Custom profile fields go here $form_container = new FormContainer($lang->custom_profile_fields_match);	// Custom profile fields go here $form_container = new FormContainer($lang->custom_profile_fields_match);
Zeile 4155	Zeile 4188
$profile_fields = array(); while($profile_field = $db->fetch_array($query))	$profile_fields = array(); while($profile_field = $db->fetch_array($query))
{	{
if($profile_field['required'] == 1) { $profile_fields['required'][] = $profile_field;	if($profile_field['required'] == 1) { $profile_fields['required'][] = $profile_field;
Zeile 4231	Zeile 4264
else { $source_ratings[] = $rating;	else { $source_ratings[] = $rating;
} }	} }
// If there are duplicates, mark them for deletion foreach($source_ratings as $rating) { if(in_array($rating['tid'], $dest_threads))	// If there are duplicates, mark them for deletion foreach($source_ratings as $rating) { if(in_array($rating['tid'], $dest_threads))
{	{
$delete_list[] = $rating['rid']; $decrement_list[$rating['tid']][] = (int) $rating['rating']; }	$delete_list[] = $rating['rid']; $decrement_list[$rating['tid']][] = (int) $rating['rating']; }
}	}
// Attribute all of the source user's ratings to the destination user $db->update_query("threadratings", array("uid" => $destination_uid), "uid='{$source_uid}'");	// Attribute all of the source user's ratings to the destination user $db->update_query("threadratings", array("uid" => $destination_uid), "uid='{$source_uid}'");
Zeile 4262	Zeile 4295
// Delete the duplicate/disallowed ratings if(!empty($delete_list))	// Delete the duplicate/disallowed ratings if(!empty($delete_list))
{	{
$imp = implode(',', $delete_list); $db->delete_query('threadratings', "rid IN ({$imp})"); }	$imp = implode(',', $delete_list); $db->delete_query('threadratings', "rid IN ({$imp})"); }
Zeile 4272	Zeile 4305
{ foreach($decrement_list as $tid => $ratings) {	{ foreach($decrement_list as $tid => $ratings) {
$db->update_query('threads', array('numratings' => 'numratings-'.count($ratings), 'totalratings' => 'totalratings-'.array_sum($ratings)), "tid='{$tid}'", 1, true);	if(is_array($ratings)) { $db->update_query('threads', array('numratings' => 'numratings-'.count($ratings), 'totalratings' => 'totalratings-'.array_sum($ratings)), "tid='{$tid}'", 1, true); }
} } }	} } }