| Zeile 931 | Zeile 931 |
|---|
<link rel="stylesheet" href="../jscripts/sceditor/editor_themes/mybb.css" type="text/css" media="all" />
<script type="text/javascript" src="../jscripts/sceditor/jquery.sceditor.bbcode.min.js?ver=1805"></script>
|
<link rel="stylesheet" href="../jscripts/sceditor/editor_themes/mybb.css" type="text/css" media="all" />
<script type="text/javascript" src="../jscripts/sceditor/jquery.sceditor.bbcode.min.js?ver=1805"></script>
|
<script type="text/javascript" src="../jscripts/bbcodes_sceditor.js?ver=1808"></script>
| <script type="text/javascript" src="../jscripts/bbcodes_sceditor.js?ver=1819"></script>
|
<script type="text/javascript" src="../jscripts/sceditor/editor_plugins/undo.js?ver=1805"></script>
EOF;
$page->output_header($lang->edit_user);
| <script type="text/javascript" src="../jscripts/sceditor/editor_plugins/undo.js?ver=1805"></script>
EOF;
$page->output_header($lang->edit_user);
|
| Zeile 1228 | Zeile 1228 |
|---|
//
// 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']));
$login_options = array(
$form->generate_check_box("invisible", 1, $lang->hide_from_whos_online, array("checked" => $mybb->input['invisible'])),
|
echo "<div id=\"tab_settings\">\n";
$form_container = new FormContainer($lang->account_settings.': '.htmlspecialchars_uni($user['username']));
$login_options = array(
$form->generate_check_box("invisible", 1, $lang->hide_from_whos_online, array("checked" => $mybb->input['invisible'])),
|
);
| );
|
$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)
|
| Zeile 1254 | Zeile 1252 |
|---|
$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_notification, $lang->instant_email_notification, $lang->instant_pm_notification), $mybb->input['subscriptionmethod'], array('id' => 'subscriptionmethod'))
);
|
$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_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 1273 | Zeile 1276 |
|---|
"<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'))
|
"<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>");
|
|
|
$tpp_options = array($lang->use_default);
if($mybb->settings['usertppoptions'])
|
$tpp_options = array($lang->use_default);
if($mybb->settings['usertppoptions'])
|
{
| {
|
$explodedtpp = explode(",", $mybb->settings['usertppoptions']);
if(is_array($explodedtpp))
{
| $explodedtpp = explode(",", $mybb->settings['usertppoptions']);
if(is_array($explodedtpp))
{
|
| Zeile 1290 | Zeile 1298 |
|---|
}
}
}
|
}
}
}
|
|
|
$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 1308 | Zeile 1316 |
|---|
"<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 1317 | Zeile 1330 |
|---|
if(is_array($explodedppp))
{
foreach($explodedppp as $ppp)
|
if(is_array($explodedppp))
{
foreach($explodedppp as $ppp)
|
{
| {
|
if($ppp <= 0) continue;
$ppp_options[$ppp] = $ppp;
}
| if($ppp <= 0) continue;
$ppp_options[$ppp] = $ppp;
}
|
| Zeile 1334 | Zeile 1347 |
|---|
"<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 1345 | Zeile 1363 |
|---|
"<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 1537 | Zeile 1560 |
|---|
if($mybb->settings['avatarresizing'] == "auto")
{
$auto_resize = $lang->avatar_auto_resize;
|
if($mybb->settings['avatarresizing'] == "auto")
{
$auto_resize = $lang->avatar_auto_resize;
|
}
| }
|
else if($mybb->settings['avatarresizing'] == "user")
{
$auto_resize = "<input type=\"checkbox\" name=\"auto_resize\" value=\"1\" checked=\"checked\" id=\"auto_resize\" /> <label for=\"auto_resize\">{$lang->attempt_to_auto_resize}</label></span>";
| else if($mybb->settings['avatarresizing'] == "user")
{
$auto_resize = "<input type=\"checkbox\" name=\"auto_resize\" value=\"1\" checked=\"checked\" id=\"auto_resize\" /> <label for=\"auto_resize\">{$lang->attempt_to_auto_resize}</label></span>";
|
| Zeile 1580 | Zeile 1603 |
|---|
{
$remaining = $user['moderationtime']-TIME_NOW;
$expired = nice_time($remaining, array('seconds' => false));
|
{
$remaining = $user['moderationtime']-TIME_NOW;
$expired = nice_time($remaining, array('seconds' => false));
|
$color = 'inherit';
|
$color = 'inherit';
|
if($remaining < 3600)
{
$color = 'red';
| if($remaining < 3600)
{
$color = 'red';
|
| Zeile 1710 | Zeile 1733 |
|---|
else
{
$("#suspost").show();
|
else
{
$("#suspost").show();
|
}
| }
|
// -->
</script>';
|
// -->
</script>';
|
| Zeile 1726 | Zeile 1749 |
|---|
if(!$user['uid'])
{
flash_message($lang->error_invalid_user, 'error');
|
if(!$user['uid'])
{
flash_message($lang->error_invalid_user, 'error');
|
admin_redirect("index.php?module=user-users");
| admin_redirect("index.php?module=user-users");
|
}
if(is_super_admin($mybb->input['uid']) && $mybb->user['uid'] != $mybb->input['uid'] && !is_super_admin($mybb->user['uid']))
| }
if(is_super_admin($mybb->input['uid']) && $mybb->user['uid'] != $mybb->input['uid'] && !is_super_admin($mybb->user['uid']))
|
| Zeile 1742 | Zeile 1765 |
|---|
}
$plugins->run_hooks("admin_user_users_delete");
|
}
$plugins->run_hooks("admin_user_users_delete");
|
|
|
if($mybb->request_method == "post")
{
$plugins->run_hooks("admin_user_users_delete_commit");
| if($mybb->request_method == "post")
{
$plugins->run_hooks("admin_user_users_delete_commit");
|
| Zeile 1753 | Zeile 1776 |
|---|
// Delete the user
if(!$userhandler->delete_user($user['uid']))
|
// Delete the user
if(!$userhandler->delete_user($user['uid']))
|
{
| {
|
flash_message($lang->error_cannot_delete_user, 'error');
admin_redirect("index.php?module=user-users");
}
| flash_message($lang->error_cannot_delete_user, 'error');
admin_redirect("index.php?module=user-users");
}
|
| Zeile 1763 | Zeile 1786 |
|---|
$plugins->run_hooks("admin_user_users_delete_commit_end");
log_admin_action($user['uid'], $user['username']);
|
$plugins->run_hooks("admin_user_users_delete_commit_end");
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 1785 | Zeile 1808 |
|---|
);
$plugins->run_hooks("admin_user_users_referrers");
|
);
$plugins->run_hooks("admin_user_users_referrers");
|
|
|
$page->output_nav_tabs($sub_tabs, 'referrers');
// Fetch default admin view
| $page->output_nav_tabs($sub_tabs, 'referrers');
// Fetch default admin view
|
| Zeile 1796 | Zeile 1819 |
|---|
}
$query = $db->simple_select("adminviews", "*", "type='user' AND (vid='{$default_view}' OR uid=0)", array("order_by" => "uid", "order_dir" => "desc"));
$admin_view = $db->fetch_array($query);
|
}
$query = $db->simple_select("adminviews", "*", "type='user' AND (vid='{$default_view}' OR uid=0)", array("order_by" => "uid", "order_dir" => "desc"));
$admin_view = $db->fetch_array($query);
|
|
|
if($mybb->input['type'])
{
$admin_view['view_type'] = $mybb->input['type'];
|
if($mybb->input['type'])
{
$admin_view['view_type'] = $mybb->input['type'];
|
}
| }
|
$admin_view['conditions'] = my_unserialize($admin_view['conditions']);
$admin_view['conditions']['referrer'] = $mybb->input['uid'];
$view = build_users_view($admin_view);
|
$admin_view['conditions'] = my_unserialize($admin_view['conditions']);
$admin_view['conditions']['referrer'] = $mybb->input['uid'];
$view = build_users_view($admin_view);
|
|
|
// No referred users
if(!$view)
{
| // No referred users
if(!$view)
{
|
| Zeile 1840 | Zeile 1863 |
|---|
$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($user['uid'], $user['username']);
|
// Log admin action
log_admin_action($user['uid'], $user['username']);
|
|
|
$table = new Table;
|
$table = new Table;
|
|
|
$table->construct_header($lang->ip_address);
$table->construct_header($lang->controls, array('width' => 200, 'class' => "align_center"));
if(empty($user['lastip']))
|
$table->construct_header($lang->ip_address);
$table->construct_header($lang->controls, array('width' => 200, 'class' => "align_center"));
if(empty($user['lastip']))
|
{
| {
|
$user['lastip'] = $lang->unknown;
|
$user['lastip'] = $lang->unknown;
|
$controls = '';
}
else
{
| $controls = '';
}
else
{
|
$user['lastip'] = my_inet_ntop($db->unescape_binary($user['lastip']));
$popup = new PopupMenu("user_last", $lang->options);
$popup->add_item($lang->show_users_regged_with_ip,
| $user['lastip'] = my_inet_ntop($db->unescape_binary($user['lastip']));
$popup = new PopupMenu("user_last", $lang->options);
$popup->add_item($lang->show_users_regged_with_ip,
|
| Zeile 1882 | Zeile 1905 |
|---|
$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();
$counter = 0;
|
$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))
{
| $query = $db->simple_select("posts", "DISTINCT ipaddress", "uid='{$mybb->input['uid']}'");
while($ip = $db->fetch_array($query))
{
|
| Zeile 1918 | Zeile 1941 |
|---|
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'])
{
$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;
}
| foreach(array('source', 'destination') as $target)
{
${$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(!is_super_admin($mybb->user['uid']) && (is_super_admin($source_user['uid']) || is_super_admin($destination_user['uid'])))
|
// 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(!is_super_admin($mybb->user['uid']) && (is_super_admin($source_user['uid']) || is_super_admin($destination_user['uid'])))
|
{
| {
|
flash_message($lang->error_no_perms_super_admin, 'error');
|
flash_message($lang->error_no_perms_super_admin, 'error');
|
admin_redirect("index.php?module=user-users");
}
if($source_user['uid'] == $destination_user['uid'])
{
$errors[] = $lang->error_cannot_merge_same_account;
}
| admin_redirect("index.php?module=user-users");
}
if($source_user['uid'] == $destination_user['uid'] && !empty($source_user['uid']))
{
$errors[] = $lang->error_cannot_merge_same_account;
}
|
if(empty($errors))
{
|
if(empty($errors))
{
|
| Zeile 1950 | Zeile 1970 |
|---|
);
$query = $db->simple_select("adminoptions", "uid", "uid='{$destination_user['uid']}'");
$existing_admin_options = $db->fetch_field($query, "uid");
|
);
$query = $db->simple_select("adminoptions", "uid", "uid='{$destination_user['uid']}'");
$existing_admin_options = $db->fetch_field($query, "uid");
|
|
|
// Only carry over admin options/permissions if we don't already have them
if(!$existing_admin_options)
{
| // Only carry over admin options/permissions if we don't already have them
if(!$existing_admin_options)
{
|
| Zeile 1978 | Zeile 1998 |
|---|
// 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 2028 | Zeile 2052 |
|---|
$total_reputation = $db->fetch_field($query, "total_rep");
$db->update_query("users", array('reputation' => (int)$total_reputation), "uid='{$destination_user['uid']}'");
|
$total_reputation = $db->fetch_field($query, "total_rep");
$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
FROM ".TABLE_PREFIX."warnings
WHERE uid='{$source_user['uid']}' AND expired='0'
|
// Calculate warning points
$query = $db->query("
SELECT SUM(points) as warn_lev
FROM ".TABLE_PREFIX."warnings
WHERE uid='{$source_user['uid']}' AND expired='0'
|
");
| ");
|
$original_warn_level = $db->fetch_field($query, "warn_lev");
$query = $db->query("
| $original_warn_level = $db->fetch_field($query, "warn_lev");
$query = $db->query("
|
| Zeile 2056 | Zeile 2080 |
|---|
"edituid" => $destination_user['uid']
);
$db->update_query("posts", $edit_uid, "edituid='{$source_user['uid']}'");
|
"edituid" => $destination_user['uid']
);
$db->update_query("posts", $edit_uid, "edituid='{$source_user['uid']}'");
|
|
|
$from_uid = array(
"fromid" => $destination_user['uid']
);
| $from_uid = array(
"fromid" => $destination_user['uid']
);
|
| Zeile 2072 | Zeile 2096 |
|---|
$buddies = array_unique(array_merge($source_buddies, $destination_buddies));
// Make sure the new buddy list doesn't contain either users
$buddies_array = array_diff($buddies, array($destination_user['uid'], $source_user['uid']));
|
$buddies = array_unique(array_merge($source_buddies, $destination_buddies));
// Make sure the new buddy list doesn't contain either users
$buddies_array = array_diff($buddies, array($destination_user['uid'], $source_user['uid']));
|
|
|
$destination_ignored = explode(',', $destination_user['ignorelist']);
$source_ignored = explode(',', $destination_user['ignorelist']);
$ignored = array_unique(array_merge($source_ignored, $destination_ignored));
| $destination_ignored = explode(',', $destination_user['ignorelist']);
$source_ignored = explode(',', $destination_user['ignorelist']);
$ignored = array_unique(array_merge($source_ignored, $destination_ignored));
|
| Zeile 2160 | Zeile 2184 |
|---|
{
$page->output_inline_error($errors);
}
|
{
$page->output_inline_error($errors);
}
|
|
|
$form = new Form("index.php?module=user-users&action=merge", "post");
$form_container = new FormContainer($lang->merge_users);
| $form = new Form("index.php?module=user-users&action=merge", "post");
$form_container = new FormContainer($lang->merge_users);
|
| Zeile 2291 | Zeile 2315 |
|---|
if($mybb->input['conditions'])
{
$admin_view['conditions'] = $mybb->input['conditions'];
|
if($mybb->input['conditions'])
{
$admin_view['conditions'] = $mybb->input['conditions'];
|
}
| }
|
if($mybb->input['sortby'])
{
$admin_view['sortby'] = $mybb->input['sortby'];
| if($mybb->input['sortby'])
{
$admin_view['sortby'] = $mybb->input['sortby'];
|
| Zeile 3347 | Zeile 3371 |
|---|
if($value == $column)
{
$value = $text;
|
if($value == $column)
{
$value = $text;
|
}
| }
|
if($value == $lang->na)
{
continue;
| if($value == $lang->na)
{
continue;
|
| Zeile 3974 | Zeile 3998 |
|---|
$user_options = $values[$field_name];
}
|
$user_options = $values[$field_name];
}
|
|
|
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();
if($search == true)
{
$select_options[''] = $lang->na;
| $options = array();
if($search == true)
{
$select_options[''] = $lang->na;
|
}
foreach($select_options as $val)
| }
foreach($select_options as $val)
|
| Zeile 4022 | Zeile 4046 |
|---|
else
{
$code = $form->generate_select_box("profile_fields[{$field_name}]", $options, htmlspecialchars_uni($values[$field_name]), array('id' => "profile_field_{$field_name}", 'size' => $profile_field['length']));
|
else
{
$code = $form->generate_select_box("profile_fields[{$field_name}]", $options, htmlspecialchars_uni($values[$field_name]), array('id' => "profile_field_{$field_name}", 'size' => $profile_field['length']));
|
}
break;
| }
break;
|
case "radio":
$radio_options = array();
if($search == true)
| case "radio":
$radio_options = array();
if($search == true)
|
| Zeile 4033 | Zeile 4057 |
|---|
$radio_options += explode("\n", $options);
$code = '';
foreach($radio_options as $val)
|
$radio_options += explode("\n", $options);
$code = '';
foreach($radio_options as $val)
|
{
| {
|
$val = trim($val);
$code .= $form->generate_radio_button("profile_fields[{$field_name}]", $val, htmlspecialchars_uni($val), array('id' => "profile_field_{$field_name}", 'checked' => ($val == $values[$field_name] ? true : false)))."<br />";
}
| $val = trim($val);
$code .= $form->generate_radio_button("profile_fields[{$field_name}]", $val, htmlspecialchars_uni($val), array('id' => "profile_field_{$field_name}", 'checked' => ($val == $values[$field_name] ? true : false)))."<br />";
}
|
| Zeile 4043 | Zeile 4067 |
|---|
if(!is_array($values[$field_name]))
{
$user_options = explode("\n", $values[$field_name]);
|
if(!is_array($values[$field_name]))
{
$user_options = explode("\n", $values[$field_name]);
|
}
| }
|
else
|
else
|
{
| {
|
$user_options = $values[$field_name];
|
$user_options = $values[$field_name];
|
}
| }
|
$selected_options = array();
foreach($user_options as $val)
{
$selected_options[$val] = $val;
}
|
$selected_options = array();
foreach($user_options as $val)
{
$selected_options[$val] = $val;
}
|
|
|
if($search == true)
{
$select_options[''] = $lang->na;
| if($search == true)
{
$select_options[''] = $lang->na;
|