Vergleich admin/modules/user/users.php - 1.8.11 - 1.8.21

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'],	"yahoo" => $mybb->input['yahoo'], "skype" => $mybb->input['skype'], "google" => $mybb->input['google'],
Zeile 646	Zeile 645
} // 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 693
{ 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 843
} // 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 929
$page->extra_header .= <<<EOF	$page->extra_header .= <<<EOF
<link rel="stylesheet" href="../jscripts/sceditor/editor_themes/mybb.css" type="text/css" media="all" />	<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=1805"></script>	<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>	<script type="text/javascript" src="../jscripts/bbcodes_sceditor.js?ver=1821"></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 954
// 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 977
$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']) { require_once MYBB_ROOT."inc/functions_image.php"; list($width, $height) = explode("\|", $user['avatardimensions']); $scaled_dimensions = scale_image($width, $height, 120, 120); } else	{ if(!my_validate_url($user['avatar']))
{	{
$scaled_dimensions = array( "width" => 120, "height" => 120 );	$avatar = format_avatar($user['avatar'], $user['avatardimensions']); $user['avatar'] = $avatar['image'];
}	}
if(!my_validate_url($user['avatar'])) { $user['avatar'] = "../{$user['avatar']}\n"; } } else {	} else {
if(my_validate_url($mybb->settings['useravatar'])) { $user['avatar'] = str_replace('{theme}', 'images', $mybb->settings['useravatar']);	if(my_validate_url($mybb->settings['useravatar'])) { $user['avatar'] = str_replace('{theme}', 'images', $mybb->settings['useravatar']);
Zeile 1009	Zeile 1009
{ $user['avatar'] = "../".str_replace('{theme}', 'images', $mybb->settings['useravatar']); }	{ $user['avatar'] = "../".str_replace('{theme}', 'images', $mybb->settings['useravatar']); }
$scaled_dimensions = array( "width" => 120, "height" => 120 );
} $avatar_top = ceil((126-$scaled_dimensions['height'])/2); if($user['lastactive']) { $last_active = my_date('relative', $user['lastactive']);	} $avatar_top = ceil((126-$scaled_dimensions['height'])/2); if($user['lastactive']) { $last_active = my_date('relative', $user['lastactive']);
} else {	} else {
$last_active = $lang->never; } $reg_date = my_date('relative', $user['regdate']); if($user['dst'] == 1)	$last_active = $lang->never; } $reg_date = my_date('relative', $user['regdate']); if($user['dst'] == 1)
{	{
$timezone = (float)$user['timezone']+1;	$timezone = (float)$user['timezone']+1;
}	}
else { $timezone = (float)$user['timezone'];	else { $timezone = (float)$user['timezone'];
}	}
$local_date = gmdate($mybb->settings['dateformat'], TIME_NOW + ($timezone * 3600)); $local_time = gmdate($mybb->settings['timeformat'], TIME_NOW + ($timezone * 3600));	$local_date = gmdate($mybb->settings['dateformat'], TIME_NOW + ($timezone * 3600)); $local_time = gmdate($mybb->settings['timeformat'], TIME_NOW + ($timezone * 3600));
Zeile 1053	Zeile 1049
if($posts == 0) { $percent_posts = "0";	if($posts == 0) { $percent_posts = "0";
} else	} else
{ $percent_posts = round($user['postnum']*100/$posts, 2); }	{ $percent_posts = round($user['postnum']*100/$posts, 2); }
Zeile 1065	Zeile 1061
if($user_permissions['usereputationsystem'] == 1 && $mybb->settings['enablereputation'] == 1) { $reputation = get_reputation($user['reputation']);	if($user_permissions['usereputationsystem'] == 1 && $mybb->settings['enablereputation'] == 1) { $reputation = get_reputation($user['reputation']);
}	}
else { $reputation = "-";	else { $reputation = "-";
Zeile 1076	Zeile 1072
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 1091	Zeile 1087
{ $age = get_age($user['birthday']); }	{ $age = get_age($user['birthday']); }

$postnum = my_number_format($user['postnum']); $table->construct_cell("<div style=\"width: 126px; height: 126px;\" class=\"user_avatar\"><img src=\"".htmlspecialchars_uni($user['avatar'])."\" style=\"margin-top: {$avatar_top}px\" width=\"{$scaled_dimensions['width']}\" height=\"{$scaled_dimensions['height']}\" alt=\"\" /></div>", array('rowspan' => 6, 'width' => 1));	$postnum = my_number_format($user['postnum']); $table->construct_cell("<div style=\"width: 126px; height: 126px;\" class=\"user_avatar\"><img src=\"".htmlspecialchars_uni($user['avatar'])."\" style=\"margin-top: {$avatar_top}px\" width=\"{$scaled_dimensions['width']}\" height=\"{$scaled_dimensions['height']}\" alt=\"\" /></div>", array('rowspan' => 6, 'width' => 1));
Zeile 1106	Zeile 1102
$table->construct_row(); $table->construct_cell("<strong>{$lang->posts_per_day}:</strong> {$posts_per_day}"); $table->construct_cell("<strong>{$lang->reputation}:</strong> {$reputation}");	$table->construct_row(); $table->construct_cell("<strong>{$lang->posts_per_day}:</strong> {$posts_per_day}"); $table->construct_cell("<strong>{$lang->reputation}:</strong> {$reputation}");
$table->construct_row();	$table->construct_row();
$table->construct_cell("<strong>{$lang->percent_of_total_posts}:</strong> {$percent_posts}"); $table->construct_cell("<strong>{$lang->warning_level}:</strong> {$warning_level}"); $table->construct_row();	$table->construct_cell("<strong>{$lang->percent_of_total_posts}:</strong> {$percent_posts}"); $table->construct_cell("<strong>{$lang->warning_level}:</strong> {$warning_level}"); $table->construct_row();
Zeile 1117	Zeile 1113
$username = htmlspecialchars_uni($user['username']); $table->output("{$lang->user_overview}: {$username}"); $plugins->run_hooks("admin_user_users_edit_overview");	$username = htmlspecialchars_uni($user['username']); $table->output("{$lang->user_overview}: {$username}"); $plugins->run_hooks("admin_user_users_edit_overview");
echo "</div>\n"; // // PROFILE	echo "</div>\n"; // // PROFILE
// echo "<div id=\"tab_profile\">\n";	// echo "<div id=\"tab_profile\">\n";
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->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');
Zeile 1230	Zeile 1225
// // 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 1244	Zeile 1237
{ $mybb->input['pmnotice'] = 1; }	{ $mybb->input['pmnotice'] = 1; }

$messaging_options = array( $form->generate_check_box("allownotices", 1, $lang->recieve_admin_emails, array("checked" => $mybb->input['allownotices'])), $form->generate_check_box("hideemail", 1, $lang->hide_email_from_others, array("checked" => $mybb->input['hideemail'])),	$messaging_options = array( $form->generate_check_box("allownotices", 1, $lang->recieve_admin_emails, array("checked" => $mybb->input['allownotices'])), $form->generate_check_box("hideemail", 1, $lang->hide_email_from_others, array("checked" => $mybb->input['hideemail'])),
Zeile 1254	Zeile 1247
$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'))
);	);
$form_container->output_row($lang->messaging_and_notification, "", "<div class=\"user_settings_bit\">".implode("</div><div class=\"user_settings_bit\">", $messaging_options)."</div>");	// 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)	$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[$key] = my_date($format, TIME_NOW, "", 0); }	$time_format_options = array($lang->use_default); foreach($time_formats as $key => $format) { $time_format_options[$key] = my_date($format, TIME_NOW, "", 0); }

$date_options = array( "<label for=\"dateformat\">{$lang->date_format}:</label><br />".$form->generate_select_box("dateformat", $date_format_options, $mybb->input['dateformat'], array('id' => 'dateformat')), "<label for=\"dateformat\">{$lang->time_format}:</label><br />".$form->generate_select_box("timeformat", $time_format_options, $mybb->input['timeformat'], array('id' => 'timeformat')), "<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')) );	$date_options = array( "<label for=\"dateformat\">{$lang->date_format}:</label><br />".$form->generate_select_box("dateformat", $date_format_options, $mybb->input['dateformat'], array('id' => 'dateformat')), "<label for=\"dateformat\">{$lang->time_format}:</label><br />".$form->generate_select_box("timeformat", $time_format_options, $mybb->input['timeformat'], array('id' => 'timeformat')), "<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 1313
"<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 1344
"<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 1360
"<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 1515	Zeile 1533
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 1782
$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 1800	Zeile 1818
$admin_view = $db->fetch_array($query); if($mybb->input['type'])	$admin_view = $db->fetch_array($query); if($mybb->input['type'])
{ $admin_view['view_type'] = $mybb->input['type'];	{ $admin_view['view_type'] = $mybb->input['type'];
} $admin_view['conditions'] = my_unserialize($admin_view['conditions']);	} $admin_view['conditions'] = my_unserialize($admin_view['conditions']);
Zeile 1837	Zeile 1855
); $plugins->run_hooks("admin_user_users_ipaddresses");	); $plugins->run_hooks("admin_user_users_ipaddresses");

$page->output_nav_tabs($sub_tabs, 'ipaddresses');	$page->output_nav_tabs($sub_tabs, 'ipaddresses');

$query = $db->simple_select("users", "uid, regip, username, lastip", "uid='{$mybb->input['uid']}'", array('limit' => 1)); $user = $db->fetch_array($query);	$query = $db->simple_select("users", "uid, regip, username, lastip", "uid='{$mybb->input['uid']}'", array('limit' => 1)); $user = $db->fetch_array($query);

// Log admin action	// 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 1884	Zeile 1902
$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']}");	$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();	$controls = $popup->fetch();
} $table->construct_cell("<strong>{$lang->registration_ip}:</strong> ".$user['regip']); $table->construct_cell($controls, array('class' => "align_center")); $table->construct_row();	} $table->construct_cell("<strong>{$lang->registration_ip}:</strong> ".$user['regip']); $table->construct_cell($controls, array('class' => "align_center")); $table->construct_row();

$counter = 0; $query = $db->simple_select("posts", "DISTINCT ipaddress", "uid='{$mybb->input['uid']}'"); while($ip = $db->fetch_array($query))	$counter = 0; $query = $db->simple_select("posts", "DISTINCT ipaddress", "uid='{$mybb->input['uid']}'"); while($ip = $db->fetch_array($query))
{	{
++$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);
Zeile 1903	Zeile 1921
$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();

$table->construct_cell($ip['ipaddress']); $table->construct_cell($controls, array('class' => "align_center")); $table->construct_row(); }	$table->construct_cell($ip['ipaddress']); $table->construct_cell($controls, array('class' => "align_center")); $table->construct_row(); }

$table->output($lang->ip_address_for.' '.htmlspecialchars_uni($user['username']));	$table->output($lang->ip_address_for.' '.htmlspecialchars_uni($user['username']));

$page->output_footer(); }	$page->output_footer(); }

if($mybb->input['action'] == "merge") { $plugins->run_hooks("admin_user_users_merge"); if($mybb->request_method == "post") {	if($mybb->input['action'] == "merge") { $plugins->run_hooks("admin_user_users_merge"); 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 1939	Zeile 1954
admin_redirect("index.php?module=user-users"); }	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 1974	Zeile 1989
$db->update_query("warnings", $uid_update, "uid='{$source_user['uid']}'"); $db->update_query("warnings", array("revokedby" => $destination_user['uid']), "revokedby='{$source_user['uid']}'"); $db->update_query("warnings", array("issuedby" => $destination_user['uid']), "issuedby='{$source_user['uid']}'");	$db->update_query("warnings", $uid_update, "uid='{$source_user['uid']}'"); $db->update_query("warnings", array("revokedby" => $destination_user['uid']), "revokedby='{$source_user['uid']}'"); $db->update_query("warnings", array("issuedby" => $destination_user['uid']), "issuedby='{$source_user['uid']}'");

// Thread ratings merge_thread_ratings($source_user['uid'], $destination_user['uid']);	// Thread ratings merge_thread_ratings($source_user['uid'], $destination_user['uid']);

// 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 2092	Zeile 2111
"ignorelist" => $ignored ); $db->update_query("users", $lists, "uid='{$destination_user['uid']}'");	"ignorelist" => $ignored ); $db->update_query("users", $lists, "uid='{$destination_user['uid']}'");
// Set up user handler. require_once MYBB_ROOT.'inc/datahandlers/user.php'; $userhandler = new UserDataHandler('delete'); // Delete the old user $userhandler->delete_user($source_user['uid']);
// Get a list of forums where post count doesn't apply $fids = array();	// Get a list of forums where post count doesn't apply $fids = array();
Zeile 2137	Zeile 2149
} $plugins->run_hooks("admin_user_users_merge_commit");	} $plugins->run_hooks("admin_user_users_merge_commit");
	// Set up user handler. require_once MYBB_ROOT.'inc/datahandlers/user.php'; $userhandler = new UserDataHandler('delete'); // Delete the old user $userhandler->delete_user($source_user['uid']);
$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 2488
$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 2627	Zeile 2646
$table = new Table; $lang->mass_ban_info = $lang->sprintf($lang->mass_ban_info, count($selected)); $table->construct_cell($lang->mass_ban_info);	$table = new Table; $lang->mass_ban_info = $lang->sprintf($lang->mass_ban_info, count($selected)); $table->construct_cell($lang->mass_ban_info);
$table->construct_row(); $table->output($lang->important);	$table->construct_row(); $table->output($lang->important);
// If there's any errors, display inline if($errors) {	// If there's any errors, display inline if($errors) {
Zeile 2832	Zeile 2851
while($thread = $db->fetch_array($query)) { rebuild_thread_counters($thread['tid']);	while($thread = $db->fetch_array($query)) { rebuild_thread_counters($thread['tid']);
} }	} }
// 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) {
Zeile 2952	Zeile 2971
// 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 2981
} $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 3039	Zeile 3059
$page->output_header($lang->browse_users); echo "<script type=\"text/javascript\" src=\"jscripts/users.js\"></script>";	$page->output_header($lang->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']])	$page->output_nav_tabs($sub_tabs, 'browse_users'); if(isset($mybb->input['search_id']) && $admin_session['data']['user_views'][$mybb->input['search_id']])
Zeile 3237	Zeile 3257
// 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", "yahoo", "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 3498
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 3614	Zeile 3640
$user['view']['warninglevel'] = get_colored_warning_level($warning_level); }	$user['view']['warninglevel'] = get_colored_warning_level($warning_level); }
if($user['avatar'] && !my_validate_url($user['avatar'])) { $user['avatar'] = "../{$user['avatar']}"; } if($view['view_type'] == "card") { $scaled_avatar = fetch_scaled_avatar($user, 80, 80); } else { $scaled_avatar = fetch_scaled_avatar($user, 34, 34); } if(!$user['avatar'] \|\| (my_strpos($user['avatar'], '://') !== false && !$mybb->settings['allowremoteavatars'])) { 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['view']['avatar'] = "<img src=\"".htmlspecialchars_uni($user['avatar'])."\" alt=\"\" width=\"{$scaled_avatar['width']}\" height=\"{$scaled_avatar['height']}\" />";	if($view['view_type'] == "card") { $max_dimensions = '80x80'; } else { $max_dimensions = '34x34'; } $avatar = format_avatar($user['avatar'], $user['avatardimensions'], $max_dimensions); $user['view']['avatar'] = "<img src=\"".$avatar['image']."\" alt=\"\" {$avatar['width_height']} />";
// Convert IP's to readable $user['regip'] = my_inet_ntop($db->unescape_binary($user['regip']));	// Convert IP's to readable $user['regip'] = my_inet_ntop($db->unescape_binary($user['regip']));
Zeile 3725	Zeile 3739
} $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;	return false;
} });	} });
var search = $(\"#search_keywords\");	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 3743	Zeile 3757
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 3787	Zeile 3799
} $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 3831	Zeile 3843
if($i == 3) { $i = 1;	if($i == 3) { $i = 1;
}	}
// Loop through fields user wants to show foreach($view['fields'] as $field) {	// Loop through fields user wants to show foreach($view['fields'] as $field) {
Zeile 3856	Zeile 3868
else if($field != "username") { if(isset($user['view'][$field]))	else if($field != "username") { if(isset($user['view'][$field]))
{	{
$value = $user['view'][$field];	$value = $user['view'][$field];
}	}
else { $value = $user[$field];	else { $value = $user[$field];
}	}
if($field == "postnum") { $value = my_number_format($value); }	if($field == "postnum") { $value = my_number_format($value); }

$user_details[] = "<strong>{$view_field['title']}:</strong> {$value}"; }	$user_details[] = "<strong>{$view_field['title']}:</strong> {$value}"; }
Zeile 3879	Zeile 3891
$float = "left"; } else	$float = "left"; } else
{	{
$float = "right"; }	$float = "right"; }
Zeile 3891	Zeile 3903
$card .= "<div class=\"user_avatar\">{$avatar}</div>\n"; } if($user_details)	$card .= "<div class=\"user_avatar\">{$avatar}</div>\n"; } if($user_details)
{	{
$card .= "<div class=\"user_details\">".implode("<br />", $user_details)."</div>\n"; } if($controls)	$card .= "<div class=\"user_details\">".implode("<br />", $user_details)."</div>\n"; } if($controls)
Zeile 3917	Zeile 3929
if(!$user_view_fields[$field]) { continue;	if(!$user_view_fields[$field]) { continue;
}	}
$view_field = $user_view_fields[$field]; $field_options = array(); if($view_field['align'])	$view_field = $user_view_fields[$field]; $field_options = array(); if($view_field['align'])
Zeile 3931	Zeile 3943
else { $value = $user[$field];	else { $value = $user[$field];
}	}
if($field == "postnum") { $value = my_number_format($user[$field]); } $table->construct_cell($value, $field_options);	if($field == "postnum") { $value = my_number_format($user[$field]); } $table->construct_cell($value, $field_options);
}	}
$table->construct_cell("<input type=\"checkbox\" class=\"checkbox\" name=\"inlinemod_{$user['uid']}\" id=\"inlinemod_{$user['uid']}\" value=\"1\" onclick=\"$('#uid_{$user['uid']}').toggleClass('inline_selected');\" />");	$table->construct_cell("<input type=\"checkbox\" class=\"checkbox\" name=\"inlinemod_{$user['uid']}\" id=\"inlinemod_{$user['uid']}\" value=\"1\" onclick=\"$('#uid_{$user['uid']}').toggleClass('inline_selected');\" />");

$table->construct_row();	$table->construct_row();
} /** * @param array $user * @param int $max_width * @param int $max_height * * @return array */ function fetch_scaled_avatar($user, $max_width=80, $max_height=80) { $scaled_dimensions = array( "width" => $max_width, "height" => $max_height, ); global $mybb; if($user['avatar'] && (my_strpos($user['avatar'], '://') === false \|\| $mybb->settings['allowremoteavatars'])) { if($user['avatardimensions']) { require_once MYBB_ROOT."inc/functions_image.php"; list($width, $height) = explode("\|", $user['avatardimensions']); $scaled_dimensions = scale_image($width, $height, $max_width, $max_height); } } return array("width" => $scaled_dimensions['width'], "height" => $scaled_dimensions['height']); }	}
/** * @param array $fields	/** * @param array $fields
Zeile 3986	Zeile 3969
global $lang; if(!is_array($fields))	global $lang; if(!is_array($fields))
{	{
return; } foreach($fields as $profile_field)	return; } foreach($fields as $profile_field)
Zeile 4000	Zeile 3983
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 4009	Zeile 3993
$user_options = $values[$field_name]; }	$user_options = $values[$field_name]; }
$selected_options = array(); foreach($user_options as $val)	foreach($user_options as $val)
{ $selected_options[$val] = htmlspecialchars_uni($val); } $select_options = explode("\n", $options);	{ $selected_options[$val] = htmlspecialchars_uni($val); } $select_options = explode("\n", $options);
$options = array();	$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)
{ $val = htmlspecialchars_uni(trim($val)); $options[$val] = $val;	{ $val = htmlspecialchars_uni(trim($val)); $options[$val] = $val;
Zeile 4035	Zeile 4019
break; case "select": $select_options = array();	break; case "select": $select_options = array();
if($search == true)	if($search == true)
{ $select_options[''] = $lang->na; }	{ $select_options[''] = $lang->na; }
Zeile 4061	Zeile 4045
break; case "radio": $radio_options = array();	break; case "radio": $radio_options = array();
if($search == true)	if($search == true)
{ $radio_options[''] = $lang->na;	{ $radio_options[''] = $lang->na;
}	}
$radio_options += explode("\n", $options); $code = ''; foreach($radio_options as $val)	$radio_options += explode("\n", $options); $code = ''; foreach($radio_options as $val)
Zeile 4074	Zeile 4058
} break; case "checkbox":	} 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 { $user_options = $values[$field_name]; }	else { $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 4167	Zeile 4154
$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->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');
Zeile 4263	Zeile 4249
// Get all thread ratings from both accounts $query = $db->simple_select('threadratings', 'tid, uid, rid, rating', "uid IN ({$destination_uid}, {$source_uid})");	// Get all thread ratings from both accounts $query = $db->simple_select('threadratings', 'tid, uid, rid, rating', "uid IN ({$destination_uid}, {$source_uid})");
while($rating = $db->fetch_array($query))	while($rating = $db->fetch_array($query))
{ if($rating['uid'] == $destination_uid) {	{ if($rating['uid'] == $destination_uid) {
Zeile 4287	Zeile 4273
// 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}'");

// Remove ratings previously given to recently acquired threads $query = $db->query(" SELECT tr.rid, tr.rating, t.tid	// Remove ratings previously given to recently acquired threads $query = $db->query(" SELECT tr.rid, tr.rating, t.tid
Zeile 4299	Zeile 4285
{ $delete_list[] = $rating['rid']; $decrement_list[$rating['tid']][] = (int) $rating['rating'];	{ $delete_list[] = $rating['rid']; $decrement_list[$rating['tid']][] = (int) $rating['rating'];
}	}
// Delete the duplicate/disallowed ratings if(!empty($delete_list)) {	// Delete the duplicate/disallowed ratings if(!empty($delete_list)) {
Zeile 4313	Zeile 4299
{ 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); }
} } }	} } }