Vergleich admin/modules/user/users.php - 1.8.10 - 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 437	Zeile 437
if($mybb->request_method == "post") {	if($mybb->request_method == "post") {
	$plugins->run_hooks("admin_user_users_edit_start");
if(is_super_admin($mybb->input['uid']) && $mybb->user['uid'] != $mybb->input['uid'] && !is_super_admin($mybb->user['uid'])) { flash_message($lang->error_no_perms_super_admin, 'error');	if(is_super_admin($mybb->input['uid']) && $mybb->user['uid'] != $mybb->input['uid'] && !is_super_admin($mybb->user['uid'])) { flash_message($lang->error_no_perms_super_admin, 'error');
Zeile 511	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 645	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 693	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 843	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"); }
	$plugins->run_hooks("admin_user_users_edit_end");
} }	} }
Zeile 928	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 953	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 976	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']); if($user['avatar'] && (my_strpos($user['avatar'], '://') === false \|\| $mybb->settings['allowremoteavatars']))	$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['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); if($user['lastactive'])	} $avatar_top = ceil((126-$scaled_dimensions['height'])/2); if($user['lastactive'])
Zeile 1114	Zeile 1112
$username = htmlspecialchars_uni($user['username']); $table->output("{$lang->user_overview}: {$username}");	$username = htmlspecialchars_uni($user['username']); $table->output("{$lang->user_overview}: {$username}");
	$plugins->run_hooks("admin_user_users_edit_overview");
echo "</div>\n"; //	echo "</div>\n"; //
Zeile 1134	Zeile 1133
{ $options[$usergroup['gid']] = htmlspecialchars_uni($usergroup['title']); $display_group_options[$usergroup['gid']] = htmlspecialchars_uni($usergroup['title']);	{ $options[$usergroup['gid']] = htmlspecialchars_uni($usergroup['title']); $display_group_options[$usergroup['gid']] = htmlspecialchars_uni($usergroup['title']);
}	}
if(!is_array($mybb->input['additionalgroups'])) { $mybb->input['additionalgroups'] = explode(',', $mybb->input['additionalgroups']);	if(!is_array($mybb->input['additionalgroups'])) { $mybb->input['additionalgroups'] = explode(',', $mybb->input['additionalgroups']);
Zeile 1160	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 1186	Zeile 1184
10 => $lang->october, 11 => $lang->november, 12 => $lang->december	10 => $lang->october, 11 => $lang->november, 12 => $lang->december
);	);
$birthday_row = $form->generate_select_box('bday1', $birthday_days, $mybb->input['bday'][0], array('id' => 'bday_day')); $birthday_row .= ' '.$form->generate_select_box('bday2', $birthday_months, $mybb->input['bday'][1], array('id' => 'bday_month'));	$birthday_row = $form->generate_select_box('bday1', $birthday_days, $mybb->input['bday'][0], array('id' => 'bday_day')); $birthday_row .= ' '.$form->generate_select_box('bday2', $birthday_months, $mybb->input['bday'][1], array('id' => 'bday_month'));
Zeile 1198	Zeile 1196
output_custom_profile_fields($profile_fields['optional'], $mybb->input['profile_fields'], $form_container, $form); $form_container->end();	output_custom_profile_fields($profile_fields['optional'], $mybb->input['profile_fields'], $form_container, $form); $form_container->end();

if($mybb->settings['allowaway'] != 0) {	if($mybb->settings['allowaway'] != 0) {
Zeile 1210	Zeile 1208
} $form_container->output_row($lang->away_status, $lang->away_status_desc, $form->generate_radio_button('away', 1, $lang->im_away, array('id' => 'away', "checked" => $awaycheck[0]))." ".$form->generate_radio_button('away', 0, $lang->im_here, array('id' => 'away2', "checked" => $awaycheck[1])), 'away'); $form_container->output_row($lang->away_reason, $lang->away_reason_desc, $form->generate_text_box('awayreason', $mybb->input['awayreason'], array('id' => 'awayreason')), 'awayreason');	} $form_container->output_row($lang->away_status, $lang->away_status_desc, $form->generate_radio_button('away', 1, $lang->im_away, array('id' => 'away', "checked" => $awaycheck[0]))." ".$form->generate_radio_button('away', 0, $lang->im_here, array('id' => 'away2', "checked" => $awaycheck[1])), 'away'); $form_container->output_row($lang->away_reason, $lang->away_reason_desc, $form->generate_text_box('awayreason', $mybb->input['awayreason'], array('id' => 'awayreason')), 'awayreason');

//Return date (we can use the arrays from birthday) $return_row = $form->generate_select_box('away_day', $birthday_days, $mybb->input['away_day'], array('id' => 'away_day')); $return_row .= ' '.$form->generate_select_box('away_month', $birthday_months, $mybb->input['away_month'], array('id' => 'away_month'));	//Return date (we can use the arrays from birthday) $return_row = $form->generate_select_box('away_day', $birthday_days, $mybb->input['away_day'], array('id' => 'away_day')); $return_row .= ' '.$form->generate_select_box('away_month', $birthday_months, $mybb->input['away_month'], array('id' => 'away_month'));
Zeile 1221	Zeile 1219
$form_container->end(); }	$form_container->end(); }
	$plugins->run_hooks("admin_user_users_edit_profile");
echo "</div>\n";	echo "</div>\n";
//	//
// 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 1237	Zeile 1234
$form_container->output_row($lang->login_cookies_privacy, "", "<div class=\"user_settings_bit\">".implode("</div><div class=\"user_settings_bit\">", $login_options)."</div>"); if($mybb->input['pmnotice'] > 1)	$form_container->output_row($lang->login_cookies_privacy, "", "<div class=\"user_settings_bit\">".implode("</div><div class=\"user_settings_bit\">", $login_options)."</div>"); if($mybb->input['pmnotice'] > 1)
{	{
$mybb->input['pmnotice'] = 1; }	$mybb->input['pmnotice'] = 1; }
Zeile 1250	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')) ); // 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);	$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);
Zeile 1272	Zeile 1274
"<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 1285	Zeile 1292
{ if($tpp <= 0) continue; $tpp_options[$tpp] = $tpp;	{ if($tpp <= 0) continue; $tpp_options[$tpp] = $tpp;
} } }	} } }
$thread_age_options = array( 0 => $lang->use_default, 1 => $lang->show_threads_last_day,	$thread_age_options = array( 0 => $lang->use_default, 1 => $lang->show_threads_last_day,
Zeile 1305	Zeile 1312
$forum_options = array( "<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'))	$forum_options = array( "<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 1321	Zeile 1333
} } }	} } }

$thread_options = array( $form->generate_check_box("classicpostbit", 1, $lang->show_classic_postbit, array("checked" => $mybb->input['classicpostbit'])), $form->generate_check_box("showimages", 1, $lang->display_images, array("checked" => $mybb->input['showimages'])),	$thread_options = array( $form->generate_check_box("classicpostbit", 1, $lang->show_classic_postbit, array("checked" => $mybb->input['classicpostbit'])), $form->generate_check_box("showimages", 1, $lang->display_images, array("checked" => $mybb->input['showimages'])),
Zeile 1332	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')) );
	// 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());	$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());
Zeile 1343	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();
	$plugins->run_hooks("admin_user_users_edit_settings");
echo "</div>\n";	echo "</div>\n";
//	//
// SIGNATURE EDITOR // $signature_editor = $form->generate_text_area("signature", $mybb->input['signature'], array('id' => 'signature', 'rows' => 15, 'cols' => '70', 'style' => 'height: 250px; width: 95%')); $sig_smilies = $lang->off; if($mybb->settings['sigsmilies'] == 1)	// SIGNATURE EDITOR // $signature_editor = $form->generate_text_area("signature", $mybb->input['signature'], array('id' => 'signature', 'rows' => 15, 'cols' => '70', 'style' => 'height: 250px; width: 95%')); $sig_smilies = $lang->off; if($mybb->settings['sigsmilies'] == 1)
{	{
$sig_smilies = $lang->on; } $sig_mycode = $lang->off;	$sig_smilies = $lang->on; } $sig_mycode = $lang->off;
Zeile 1365	Zeile 1388
} $sig_html = $lang->off; if($mybb->settings['sightml'] == 1)	} $sig_html = $lang->off; if($mybb->settings['sightml'] == 1)
{	{
$sig_html = $lang->on; } $sig_imgcode = $lang->off;	$sig_html = $lang->on; } $sig_imgcode = $lang->off;
Zeile 1387	Zeile 1410
// Are we already suspending the signature? if($mybb->input['suspendsignature'])	// Are we already suspending the signature? if($mybb->input['suspendsignature'])
{ $sig_checked = 1;	{ $sig_checked = 1;
// Display how much time is left on the ban for the user to extend it if($user['suspendsigtime'] == "0")	// Display how much time is left on the ban for the user to extend it if($user['suspendsigtime'] == "0")
Zeile 1480	Zeile 1503
$form_container->output_row($lang->signature_preferences, "", implode("<br />", $signature_options)); $form_container->end();	$form_container->output_row($lang->signature_preferences, "", implode("<br />", $signature_options)); $form_container->end();
	$plugins->run_hooks("admin_user_users_edit_signatur");
echo "</div>\n"; //	echo "</div>\n"; //
Zeile 1509	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 1545	Zeile 1569
$form_container->output_row($lang->or_specify_avatar_url, "", $form->generate_text_box('avatar_url', $avatar_url, array('id' => 'avatar_url')), 'avatar_url'); } $form_container->end();	$form_container->output_row($lang->or_specify_avatar_url, "", $form->generate_text_box('avatar_url', $avatar_url, array('id' => 'avatar_url')), 'avatar_url'); } $form_container->end();
	$plugins->run_hooks("admin_user_users_edit_avatar");
echo "</div>\n"; //	echo "</div>\n"; //
Zeile 1644	Zeile 1669
$form_container->end();	$form_container->end();
	$plugins->run_hooks("admin_user_users_edit_moderator_options");
echo "</div>\n"; $plugins->run_hooks("admin_user_users_edit_graph");	echo "</div>\n"; $plugins->run_hooks("admin_user_users_edit_graph");
Zeile 1756	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 1836	Zeile 1862
$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 1912	Zeile 1938
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 1931	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 1962	Zeile 1985
$db->update_query("posts", $uid_update, "uid='{$source_user['uid']}'"); $db->update_query("privatemessages", $uid_update, "uid='{$source_user['uid']}'"); $db->update_query("reportedcontent", $uid_update, "uid='{$source_user['uid']}'");	$db->update_query("posts", $uid_update, "uid='{$source_user['uid']}'"); $db->update_query("privatemessages", $uid_update, "uid='{$source_user['uid']}'"); $db->update_query("reportedcontent", $uid_update, "uid='{$source_user['uid']}'");
$db->update_query("threadratings", $uid_update, "uid='{$source_user['uid']}'");
$db->update_query("threads", $uid_update, "uid='{$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']}'");	$db->update_query("threads", $uid_update, "uid='{$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']);
// 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 2022	Zeile 2051
$db->update_query("users", array('reputation' => (int)$total_reputation), "uid='{$destination_user['uid']}'"); // Calculate warning points	$db->update_query("users", array('reputation' => (int)$total_reputation), "uid='{$destination_user['uid']}'"); // Calculate warning points
$query = $db->query(" SELECT SUM(points) as warn_lev	$query = $db->query(" SELECT SUM(points) as warn_lev
FROM ".TABLE_PREFIX."warnings WHERE uid='{$source_user['uid']}' AND expired='0' ");	FROM ".TABLE_PREFIX."warnings WHERE uid='{$source_user['uid']}' AND expired='0' ");
Zeile 2082	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 2127	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 2459	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 2604	Zeile 2633
$mybb->input['action'] = "inline_banned"; log_admin_action($banned_count, $lifted); my_unsetcookie("inlinemod_useracp"); // Remove the cookie of selected users as we've finished with them	$mybb->input['action'] = "inline_banned"; log_admin_action($banned_count, $lifted); my_unsetcookie("inlinemod_useracp"); // Remove the cookie of selected users as we've finished with them

$lang->users_banned = $lang->sprintf($lang->users_banned, $banned_count); flash_message($lang->users_banned, 'success'); admin_redirect("index.php?module=user-users".$vid_url);	$lang->users_banned = $lang->sprintf($lang->users_banned, $banned_count); flash_message($lang->users_banned, 'success'); admin_redirect("index.php?module=user-users".$vid_url);
Zeile 2942	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 2951	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 3227	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 3408	Zeile 3438
$additional_sql = ''; switch($db->type)	$additional_sql = ''; switch($db->type)
{	{
case "pgsql": case "sqlite": $additional_sql .= " OR ','\|\|additionalgroups\|\|',' LIKE '%,{$usergroup},%'";	case "pgsql": case "sqlite": $additional_sql .= " OR ','\|\|additionalgroups\|\|',' LIKE '%,{$usergroup},%'";
Zeile 3468	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 { $start = 0; $mybb->input['page'] = 1;	} else { $start = 0; $mybb->input['page'] = 1;
}	}
$from_bit = ""; if(isset($mybb->input['from']) && $mybb->input['from'] == "home") {	$from_bit = ""; if(isset($mybb->input['from']) && $mybb->input['from'] == "home") {
Zeile 3482	Zeile 3518
} switch($view['sortby'])	} switch($view['sortby'])
{	{
case "regdate": case "lastactive": case "postnum":	case "regdate": case "lastactive": case "postnum":
Zeile 3559	Zeile 3595
{ // Not banned... but soon maybe! $popup->add_item($lang->ban_user, "index.php?module=user-banning&uid={$user['uid']}#username");	{ // Not banned... but soon maybe! $popup->add_item($lang->ban_user, "index.php?module=user-banning&uid={$user['uid']}#username");
}	}
if($user['usergroup'] == 5) {	if($user['usergroup'] == 5) {
Zeile 3568	Zeile 3604
$popup->add_item($lang->approve_coppa_user, "index.php?module=user-users&action=activate_user&uid={$user['uid']}&my_post_key={$mybb->post_code}{$from_bit}"); } else	$popup->add_item($lang->approve_coppa_user, "index.php?module=user-users&action=activate_user&uid={$user['uid']}&my_post_key={$mybb->post_code}{$from_bit}"); } else
{	{
$popup->add_item($lang->approve_user, "index.php?module=user-users&action=activate_user&uid={$user['uid']}&my_post_key={$mybb->post_code}{$from_bit}"); } }	$popup->add_item($lang->approve_user, "index.php?module=user-users&action=activate_user&uid={$user['uid']}&my_post_key={$mybb->post_code}{$from_bit}"); } }
Zeile 3578	Zeile 3614
$popup->add_item($lang->show_ip_addresses, "index.php?module=user-users&action=ipaddresses&uid={$user['uid']}"); $popup->add_item($lang->show_attachments, "index.php?module=forum-attachments&results=1&username=".urlencode($user['username'])); $user['view']['controls'] = $popup->fetch();	$popup->add_item($lang->show_ip_addresses, "index.php?module=user-users&action=ipaddresses&uid={$user['uid']}"); $popup->add_item($lang->show_attachments, "index.php?module=forum-attachments&results=1&username=".urlencode($user['username'])); $user['view']['controls'] = $popup->fetch();

// Fetch the reputation for this user if($usergroups[$user['usergroup']]['usereputationsystem'] == 1 && $mybb->settings['enablereputation'] == 1) { $user['view']['reputation'] = get_reputation($user['reputation']);	// Fetch the reputation for this user if($usergroups[$user['usergroup']]['usereputationsystem'] == 1 && $mybb->settings['enablereputation'] == 1) { $user['view']['reputation'] = get_reputation($user['reputation']);
}	}
else { $reputation = "-"; }	else { $reputation = "-"; }

if($mybb->settings['enablewarningsystem'] != 0 && $usergroups[$user['usergroup']]['canreceivewarnings'] != 0) { if($mybb->settings['maxwarningpoints'] < 1)	if($mybb->settings['enablewarningsystem'] != 0 && $usergroups[$user['usergroup']]['canreceivewarnings'] != 0) { if($mybb->settings['maxwarningpoints'] < 1)
Zeile 3598	Zeile 3634
$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)
{	{
$warning_level = 100; } $user['view']['warninglevel'] = get_colored_warning_level($warning_level); }	$warning_level = 100; } $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 3652	Zeile 3676
} if(!isset($view['table_id']))	} if(!isset($view['table_id']))
{	{
$view['table_id'] = "users_list"; }	$view['table_id'] = "users_list"; }
Zeile 3661	Zeile 3685
if($mybb->input['page'] > 0) { $switch_url .= "&page=".$mybb->get_input('page', MyBB::INPUT_INT);	if($mybb->input['page'] > 0) { $switch_url .= "&page=".$mybb->get_input('page', MyBB::INPUT_INT);
}	}
if($view['view_type'] != "card") { $switch_view .= "<strong>{$lang->table_view}</strong> \| <a href=\"{$switch_url}&type=card\" style=\"font-weight: normal;\">{$lang->card_view}</a>";	if($view['view_type'] != "card") { $switch_view .= "<strong>{$lang->table_view}</strong> \| <a href=\"{$switch_url}&type=card\" style=\"font-weight: normal;\">{$lang->card_view}</a>";
} else	} 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>";	{ $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? if($num_results > $view['perpage']) {	// Do we need to construct the pagination? if($num_results > $view['perpage']) {
Zeile 3681	Zeile 3705
$search_style = ""; } else	$search_style = ""; } else
{	{
$search_class = ''; $search_style = "text-align: right;"; }	$search_class = ''; $search_style = "text-align: right;"; }
Zeile 3691	Zeile 3715
if($view_upos = strpos($search_action, '&username=')) { $search_action = substr($search_action, 0, $view_upos);	if($view_upos = strpos($search_action, '&username=')) { $search_action = substr($search_action, 0, $view_upos);
}	}
$search_action = str_replace("&", "&", $search_action); $search = new Form(htmlspecialchars_uni($search_action), 'post', 'search_form', 0, '', true); $built_view = $search->construct_return;	$search_action = str_replace("&", "&", $search_action); $search = new Form(htmlspecialchars_uni($search_action), 'post', 'search_form', 0, '', true); $built_view = $search->construct_return;
Zeile 3701	Zeile 3725
{ $default_class = ''; $value = $view['conditions']['username'];	{ $default_class = ''; $value = $view['conditions']['username'];
}	}
else { $default_class = "search_default"; $value = $lang->search_for_user;	else { $default_class = "search_default"; $value = $lang->search_for_user;
}	}
$built_view .= $search->generate_text_box('username', htmlspecialchars_uni($value), array('id' => 'search_keywords', 'class' => "{$default_class} field150 field_small"))."\n"; $built_view .= "<input type=\"submit\" class=\"search_button\" value=\"{$lang->search}\" />\n"; if($view['popup'])	$built_view .= $search->generate_text_box('username', htmlspecialchars_uni($value), array('id' => 'search_keywords', 'class' => "{$default_class} field150 field_small"))."\n"; $built_view .= "<input type=\"submit\" class=\"search_button\" value=\"{$lang->search}\" />\n"; if($view['popup'])
Zeile 3715	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 3733	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 3777	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 3933	Zeile 3955
$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_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();
} /** * @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']);
} /**	} /**
Zeile 3990	Zeile 3983
switch($type) { case "multiselect":	switch($type) { case "multiselect":
	$selected_options = array();
if(!is_array($values[$field_name]))	if(!is_array($values[$field_name]))
{	{
$user_options = explode("\n", $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] = htmlspecialchars_uni($val);	foreach($user_options as $val) { $selected_options[$val] = htmlspecialchars_uni($val);
Zeile 4064	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]);
Zeile 4071	Zeile 4066
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 4090	Zeile 4087
} break; case "textarea":	} break; case "textarea":
$extra = ''; if(isset($mybb->input['action']) && $mybb->input['action'] == "search") { $extra = " {$lang->or} ".$form->generate_check_box("profile_fields[{$field_name}_blank]", 1, $lang->is_not_blank, array('id' => "{$field_name}_blank", 'checked' => $values[$field_name.'_blank']));	$extra = ''; if(isset($mybb->input['action']) && $mybb->input['action'] == "search") { $extra = " {$lang->or} ".$form->generate_check_box("profile_fields[{$field_name}_blank]", 1, $lang->is_not_blank, array('id' => "{$field_name}_blank", 'checked' => $values[$field_name.'_blank']));
} $code = $form->generate_text_area("profile_fields[{$field_name}]", $values[$field_name], array('id' => "profile_field_{$field_name}", 'rows' => 6, 'cols' => 50)).$extra;	} $code = $form->generate_text_area("profile_fields[{$field_name}]", $values[$field_name], array('id' => "profile_field_{$field_name}", 'rows' => 6, 'cols' => 50)).$extra;
Zeile 4157	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 4239	Zeile 4235
}); // --> </script>';	}); // --> </script>';
	} /** * @param int $source_uid * @param int $destination_uid */ function merge_thread_ratings($source_uid, $destination_uid) { global $db; $source_ratings = $dest_threads = $delete_list = $decrement_list = array(); // 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)) { if($rating['uid'] == $destination_uid) { $dest_threads[] = $rating['tid']; } else { $source_ratings[] = $rating; } } // 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']; } } // 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 FROM {$db->table_prefix}threadratings tr LEFT JOIN {$db->table_prefix}threads t ON (t.tid=tr.tid) WHERE tr.uid='{$destination_uid}' AND tr.uid=t.uid "); while($rating = $db->fetch_array($query)) { $delete_list[] = $rating['rid']; $decrement_list[$rating['tid']][] = (int) $rating['rating']; } // Delete the duplicate/disallowed ratings if(!empty($delete_list)) { $imp = implode(',', $delete_list); $db->delete_query('threadratings', "rid IN ({$imp})"); } // Correct the thread rating counters if(!empty($decrement_list)) { foreach($decrement_list as $tid => $ratings) { if(is_array($ratings)) { $db->update_query('threads', array('numratings' => 'numratings-'.count($ratings), 'totalratings' => 'totalratings-'.array_sum($ratings)), "tid='{$tid}'", 1, true); } } }
}	}