Vergleich admin/modules/user/users.php - 1.6.13 - 1.6.17

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 546Zeile 546
	$query = $db->simple_select("usergroups", "gid, title", "gid != '1'", array('order_by' => 'title'));
while($usergroup = $db->fetch_array($query))
{

	$query = $db->simple_select("usergroups", "gid, title", "gid != '1'", array('order_by' => 'title'));
while($usergroup = $db->fetch_array($query))
{

		$options[$usergroup['gid']] = $usergroup['title'];
$display_group_options[$usergroup['gid']] = $usergroup['title'];

		$options[$usergroup['gid']] = htmlspecialchars_uni($usergroup['title']);
$display_group_options[$usergroup['gid']] = htmlspecialchars_uni($usergroup['title']);

	}

$form_container->output_row($lang->primary_user_group." <em>*</em>", "", $form->generate_select_box('usergroup', $options, $mybb->input['usergroup'], array('id' => 'usergroup')), 'usergroup');

	}

$form_container->output_row($lang->primary_user_group." <em>*</em>", "", $form->generate_select_box('usergroup', $options, $mybb->input['usergroup'], array('id' => 'usergroup')), 'usergroup');

Zeile 730Zeile 730
			else if($mybb->input['avatar_url'] && $mybb->input['avatar_url'] != $user['avatar'])
{
$mybb->input['avatar_url'] = preg_replace("#script:#i", "", $mybb->input['avatar_url']);

			else if($mybb->input['avatar_url'] && $mybb->input['avatar_url'] != $user['avatar'])
{
$mybb->input['avatar_url'] = preg_replace("#script:#i", "", $mybb->input['avatar_url']);

				$mybb->input['avatar_url'] = htmlspecialchars_uni($mybb->input['avatar_url']);

 
				$ext = get_extension($mybb->input['avatar_url']);

// Copy the avatar to the local server (work around remote URL access disabled for getimagesize)

				$ext = get_extension($mybb->input['avatar_url']);

// Copy the avatar to the local server (work around remote URL access disabled for getimagesize)

Zeile 1143Zeile 1142
	$query = $db->simple_select("usergroups", "gid, title", "gid != '1'", array('order_by' => 'title'));
while($usergroup = $db->fetch_array($query))
{

	$query = $db->simple_select("usergroups", "gid, title", "gid != '1'", array('order_by' => 'title'));
while($usergroup = $db->fetch_array($query))
{

		$options[$usergroup['gid']] = $usergroup['title'];
$display_group_options[$usergroup['gid']] = $usergroup['title'];

		$options[$usergroup['gid']] = htmlspecialchars_uni($usergroup['title']);
$display_group_options[$usergroup['gid']] = htmlspecialchars_uni($usergroup['title']);

	}

if(!is_array($mybb->input['additionalgroups']))

	}

if(!is_array($mybb->input['additionalgroups']))

Zeile 1472Zeile 1471

if($errors)
{


if($errors)
{

		$avatar_url = $mybb->input['avatar_url'];

		$avatar_url = htmlspecialchars_uni($mybb->input['avatar_url']);

	}

if($mybb->settings['maxavatardims'] != "")

	}

if($mybb->settings['maxavatardims'] != "")

Zeile 1685Zeile 1684
		$db->delete_query("threadsubscriptions", "uid='{$user['uid']}'");
$db->delete_query("sessions", "uid='{$user['uid']}'");
$db->delete_query("banned", "uid='{$user['uid']}'");

		$db->delete_query("threadsubscriptions", "uid='{$user['uid']}'");
$db->delete_query("sessions", "uid='{$user['uid']}'");
$db->delete_query("banned", "uid='{$user['uid']}'");

		$db->delete_query("threadratings", "uid='{$user['uid']}'");

 
		$db->delete_query("users", "uid='{$user['uid']}'");
$db->delete_query("joinrequests", "uid='{$user['uid']}'");
$db->delete_query("warnings", "uid='{$user['uid']}'");

		$db->delete_query("users", "uid='{$user['uid']}'");
$db->delete_query("joinrequests", "uid='{$user['uid']}'");
$db->delete_query("warnings", "uid='{$user['uid']}'");

Zeile 1693Zeile 1691
		$db->delete_query("awaitingactivation", "uid='{$user['uid']}'");
$db->delete_query("posts", "uid = '{$user['uid']}' AND visible = '-2'");
$db->delete_query("threads", "uid = '{$user['uid']}' AND visible = '-2'");

		$db->delete_query("awaitingactivation", "uid='{$user['uid']}'");
$db->delete_query("posts", "uid = '{$user['uid']}' AND visible = '-2'");
$db->delete_query("threads", "uid = '{$user['uid']}' AND visible = '-2'");

 

// Update thread ratings
$query = $db->query("
SELECT r.*, t.numratings, t.totalratings
FROM ".TABLE_PREFIX."threadratings r
LEFT JOIN ".TABLE_PREFIX."threads t ON (t.tid=r.tid)
WHERE r.uid='{$user['uid']}'
");
while($rating = $db->fetch_array($query))
{
$update_thread = array(
"numratings" => $rating['numratings'] - 1,
"totalratings" => $rating['totalratings'] - $rating['rating']
);
$db->update_query("threads", $update_thread, "tid='{$rating['tid']}'");
}

$db->delete_query("threadratings", "uid='{$user['uid']}'");


// Update forum stats
update_stats(array('numusers' => '-1'));


// Update forum stats
update_stats(array('numusers' => '-1'));

Zeile 2028Zeile 2044
			$db->update_query("privatemessages", $from_uid, "fromid='{$source_user['uid']}'");
$to_uid = array(
"toid" => $destination_user['uid']

			$db->update_query("privatemessages", $from_uid, "fromid='{$source_user['uid']}'");
$to_uid = array(
"toid" => $destination_user['uid']

			);

			);

			$db->update_query("privatemessages", $to_uid, "toid='{$source_user['uid']}'");

// Buddy/ignore lists

			$db->update_query("privatemessages", $to_uid, "toid='{$source_user['uid']}'");

// Buddy/ignore lists

Zeile 2097Zeile 2113
			}

update_stats(array('numusers' => '-1'));

			}

update_stats(array('numusers' => '-1'));





			$plugins->run_hooks("admin_user_users_merge_commit");

// Log admin action

			$plugins->run_hooks("admin_user_users_merge_commit");

// Log admin action

Zeile 2139Zeile 2155
	</script>';

$buttons[] = $form->generate_submit_button($lang->merge_user_accounts);

	</script>';

$buttons[] = $form->generate_submit_button($lang->merge_user_accounts);

	$form->output_submit_wrapper($buttons);
$form->end();

$page->output_footer();
}

	$form->output_submit_wrapper($buttons);
$form->end();

$page->output_footer();
}


if($mybb->input['action'] == "search")
{


if($mybb->input['action'] == "search")
{

Zeile 2158Zeile 2174
			$admin_view = $db->fetch_array($query);
// View does not exist or this view is private and does not belong to the current user
if(!$admin_view['vid'] || ($admin_view['visibility'] == 1 && $admin_view['uid'] != $mybb->user['uid']))

			$admin_view = $db->fetch_array($query);
// View does not exist or this view is private and does not belong to the current user
if(!$admin_view['vid'] || ($admin_view['visibility'] == 1 && $admin_view['uid'] != $mybb->user['uid']))

			{

			{

				unset($admin_view);
}
}

if($mybb->input['search_id'] && $admin_session['data']['user_views'][$mybb->input['search_id']])

				unset($admin_view);
}
}

if($mybb->input['search_id'] && $admin_session['data']['user_views'][$mybb->input['search_id']])

		{

		{

			$admin_view = $admin_session['data']['user_views'][$mybb->input['search_id']];
unset($admin_view['extra_sql']);
}

			$admin_view = $admin_session['data']['user_views'][$mybb->input['search_id']];
unset($admin_view['extra_sql']);
}

Zeile 2172Zeile 2188
		{
// Don't have a view? Fetch the default
if(!$admin_view['vid'])

		{
// Don't have a view? Fetch the default
if(!$admin_view['vid'])

			{

			{

				$default_view = fetch_default_view("user");
if(!$default_view)
{

				$default_view = fetch_default_view("user");
if(!$default_view)
{

Zeile 2182Zeile 2198
				$admin_view = $db->fetch_array($query);
}
}

				$admin_view = $db->fetch_array($query);
}
}





		// Override specific parts of the view
unset($admin_view['vid']);

if($mybb->input['type'])

		// Override specific parts of the view
unset($admin_view['vid']);

if($mybb->input['type'])

		{

		{

			$admin_view['view_type'] = $mybb->input['type'];
}


			$admin_view['view_type'] = $mybb->input['type'];
}


Zeile 2214Zeile 2230
		if($mybb->input['displayas'])
{
$admin_view['view_type'] = $mybb->input['displayas'];

		if($mybb->input['displayas'])
{
$admin_view['view_type'] = $mybb->input['displayas'];

		}


		}


		if($mybb->input['profile_fields'])

		if($mybb->input['profile_fields'])

		{

		{

			$admin_view['custom_profile_fields'] = $mybb->input['profile_fields'];
}


			$admin_view['custom_profile_fields'] = $mybb->input['profile_fields'];
}


Zeile 2230Zeile 2246
			$page->output_nav_tabs($sub_tabs, 'find_users');
echo $results;
$page->output_footer();

			$page->output_nav_tabs($sub_tabs, 'find_users');
echo $results;
$page->output_footer();

		}

		}

		else
{
if($mybb->input['from'] == "home")

		else
{
if($mybb->input['from'] == "home")

			{

			{

				flash_message($lang->error_no_users_found, 'error');
admin_redirect("index.php");
exit;

				flash_message($lang->error_no_users_found, 'error');
admin_redirect("index.php");
exit;

Zeile 2244Zeile 2260
				$errors[] = $lang->error_no_users_found;
}
}

				$errors[] = $lang->error_no_users_found;
}
}

	}

	}


$page->add_breadcrumb_item($lang->find_users);
$page->output_header($lang->find_users);



$page->add_breadcrumb_item($lang->find_users);
$page->output_header($lang->find_users);


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


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


	// If we have any error messages, show them
if($errors)
{

	// If we have any error messages, show them
if($errors)
{

Zeile 2258Zeile 2274
	}

if(!$mybb->input['displayas'])

	}

if(!$mybb->input['displayas'])

	{

	{

		$mybb->input['displayas'] = "card";
}


		$mybb->input['displayas'] = "card";
}


Zeile 2583Zeile 2599
							if($user['uid'] == $mybb->user['uid'] || is_super_admin($user['uid']))
{
// Remove me and super admins

							if($user['uid'] == $mybb->user['uid'] || is_super_admin($user['uid']))
{
// Remove me and super admins

 
								--$to_be_deleted;

								continue;
}
else

								continue;
}
else

Zeile 2598Zeile 2615
								$db->delete_query("threadsubscriptions", "uid='{$user['uid']}'");
$db->delete_query("sessions", "uid='{$user['uid']}'");
$db->delete_query("banned", "uid='{$user['uid']}'");

								$db->delete_query("threadsubscriptions", "uid='{$user['uid']}'");
$db->delete_query("sessions", "uid='{$user['uid']}'");
$db->delete_query("banned", "uid='{$user['uid']}'");

								$db->delete_query("threadratings", "uid='{$user['uid']}'");

 
								$db->delete_query("users", "uid='{$user['uid']}'");
$db->delete_query("joinrequests", "uid='{$user['uid']}'");
$db->delete_query("warnings", "uid='{$user['uid']}'");

								$db->delete_query("users", "uid='{$user['uid']}'");
$db->delete_query("joinrequests", "uid='{$user['uid']}'");
$db->delete_query("warnings", "uid='{$user['uid']}'");

 

// Update thread ratings
$update_thread_ratings_query = $db->query("
SELECT r.*, t.numratings, t.totalratings
FROM ".TABLE_PREFIX."threadratings r
LEFT JOIN ".TABLE_PREFIX."threads t ON (t.tid=r.tid)
WHERE r.uid='{$user['uid']}'
");
while($rating = $db->fetch_array($update_thread_ratings_query))
{
$update_thread = array(
"numratings" => $rating['numratings'] - 1,
"totalratings" => $rating['totalratings'] - $rating['rating']
);
$db->update_query("threads", $update_thread, "tid='{$rating['tid']}'");
}

$db->delete_query("threadratings", "uid='{$user['uid']}'");

							}
}
// Update forum stats, remove the cookie and redirect the user

							}
}
// Update forum stats, remove the cookie and redirect the user

Zeile 2933Zeile 2967
				$query = $db->simple_select("usergroups", "gid, title", "gid != '1'", array('order_by' => 'title'));
while($usergroup = $db->fetch_array($query))
{

				$query = $db->simple_select("usergroups", "gid, title", "gid != '1'", array('order_by' => 'title'));
while($usergroup = $db->fetch_array($query))
{

					$options[$usergroup['gid']] = $usergroup['title'];
$display_group_options[$usergroup['gid']] = $usergroup['title'];

					$options[$usergroup['gid']] = htmlspecialchars_uni($usergroup['title']);
$display_group_options[$usergroup['gid']] = htmlspecialchars_uni($usergroup['title']);

				}

if(!is_array($mybb->input['additionalgroups']))

				}

if(!is_array($mybb->input['additionalgroups']))

Zeile 3464Zeile 3498
		{
$comma = $groups_list = '';
$user['view']['username'] = "<a href=\"index.php?module=user-users&amp;action=edit&amp;uid={$user['uid']}\">".format_name($user['username'], $user['usergroup'], $user['displaygroup'])."</a>";

		{
$comma = $groups_list = '';
$user['view']['username'] = "<a href=\"index.php?module=user-users&amp;action=edit&amp;uid={$user['uid']}\">".format_name($user['username'], $user['usergroup'], $user['displaygroup'])."</a>";

			$user['view']['usergroup'] = $usergroups[$user['usergroup']]['title'];

			$user['view']['usergroup'] = htmlspecialchars_uni($usergroups[$user['usergroup']]['title']);

			if($user['additionalgroups'])
{
$additional_groups = explode(",", $user['additionalgroups']);

foreach($additional_groups as $group)
{

			if($user['additionalgroups'])
{
$additional_groups = explode(",", $user['additionalgroups']);

foreach($additional_groups as $group)
{

					$groups_list .= "{$comma}{$usergroups[$group]['title']}";

					$groups_list .= $comma.htmlspecialchars_uni($usergroups[$group]['title']);

					$comma = $lang->comma;
}
}

					$comma = $lang->comma;
}
}

Zeile 3861Zeile 3895
	}
foreach($fields as $profile_field)
{

	}
foreach($fields as $profile_field)
{

 
		$profile_field['name'] = htmlspecialchars_uni($profile_field['name']);
$profile_field['description'] = htmlspecialchars_uni($profile_field['description']);

		$profile_field['type'] = htmlspecialchars_uni($profile_field['type']);
list($type, $options) = explode("\n", $profile_field['type'], 2);
$type = trim($type);

		$profile_field['type'] = htmlspecialchars_uni($profile_field['type']);
list($type, $options) = explode("\n", $profile_field['type'], 2);
$type = trim($type);

Zeile 4022Zeile 4058
	$query = $db->simple_select("usergroups", "gid, title", "gid != '1'", array('order_by' => 'title'));
while($usergroup = $db->fetch_array($query))
{

	$query = $db->simple_select("usergroups", "gid, title", "gid != '1'", array('order_by' => 'title'));
while($usergroup = $db->fetch_array($query))
{

		$options[$usergroup['gid']] = $usergroup['title'];

		$options[$usergroup['gid']] = htmlspecialchars_uni($usergroup['title']);

	}

$form_container->output_row($lang->is_member_of_groups, $lang->additional_user_groups_desc, $form->generate_select_box('conditions[usergroup][]', $options, $input['conditions']['usergroup'], array('id' => 'usergroups', 'multiple' => true, 'size' => 5)), 'usergroups');

	}

$form_container->output_row($lang->is_member_of_groups, $lang->additional_user_groups_desc, $form->generate_select_box('conditions[usergroup][]', $options, $input['conditions']['usergroup'], array('id' => 'usergroups', 'multiple' => true, 'size' => 5)), 'usergroups');