Vergleich admin/modules/user/users.php - 1.8.37 - 1.8.39

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 519Zeile 519
			"profile_fields" => $mybb->get_input('profile_fields', MyBB::INPUT_ARRAY),
"profile_fields_editable" => true,
"website" => $mybb->get_input('website'),

			"profile_fields" => $mybb->get_input('profile_fields', MyBB::INPUT_ARRAY),
"profile_fields_editable" => true,
"website" => $mybb->get_input('website'),

			"icq" => $mybb->get_input('icq'),

 
			"skype" => $mybb->get_input('skype'),
"google" => $mybb->get_input('google'),
"birthday" => array(

			"skype" => $mybb->get_input('skype'),
"google" => $mybb->get_input('google'),
"birthday" => array(

Zeile 590Zeile 589

// Set the data of the user in the datahandler.
$userhandler->set_data($updated_user);


// Set the data of the user in the datahandler.
$userhandler->set_data($updated_user);

		$errors = '';

		$errors = array();


// Validate the user and get any errors that might have occurred.
if(!$userhandler->validate_user())


// Validate the user and get any errors that might have occurred.
if(!$userhandler->validate_user())

Zeile 632Zeile 631
				}
}
// Are we setting a new avatar from a URL?

				}
}
// Are we setting a new avatar from a URL?

			else if($mybb->input['avatar_url'] && $mybb->input['avatar_url'] != $user['avatar'])

			else if(!empty($mybb->input['avatar_url']) && $mybb->input['avatar_url'] != $user['avatar'])

			{
if(!$mybb->settings['allowremoteavatars'])
{

			{
if(!$mybb->settings['allowremoteavatars'])
{

Zeile 1175Zeile 1174
	$form_container = new FormContainer($lang->optional_profile_info.': '.htmlspecialchars_uni($user['username']));
$form_container->output_row($lang->custom_user_title, $lang->custom_user_title_desc, $form->generate_text_box('usertitle', $mybb->get_input('usertitle'), array('id' => 'usertitle')), 'usertitle');
$form_container->output_row($lang->website, "", $form->generate_text_box('website', $mybb->get_input('website'), array('id' => 'website')), 'website');

	$form_container = new FormContainer($lang->optional_profile_info.': '.htmlspecialchars_uni($user['username']));
$form_container->output_row($lang->custom_user_title, $lang->custom_user_title_desc, $form->generate_text_box('usertitle', $mybb->get_input('usertitle'), array('id' => 'usertitle')), 'usertitle');
$form_container->output_row($lang->website, "", $form->generate_text_box('website', $mybb->get_input('website'), array('id' => 'website')), 'website');

	$form_container->output_row($lang->icq_number, "", $form->generate_numeric_field('icq', $mybb->get_input('icq'), array('id' => 'icq', 'min' => 0)), 'icq');

 
	$form_container->output_row($lang->skype_handle, "", $form->generate_text_box('skype', $mybb->get_input('skype'), array('id' => 'skype')), 'skype');
$form_container->output_row($lang->google_handle, "", $form->generate_text_box('google', $mybb->get_input('google'), array('id' => 'google')), 'google');


	$form_container->output_row($lang->skype_handle, "", $form->generate_text_box('skype', $mybb->get_input('skype'), array('id' => 'skype')), 'skype');
$form_container->output_row($lang->google_handle, "", $form->generate_text_box('google', $mybb->get_input('google'), array('id' => 'google')), 'google');


Zeile 1544Zeile 1542

if($errors)
{


if($errors)
{

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




		if(isset($mybb->input['avatar_url']))
{
$avatar_url = htmlspecialchars_uni($mybb->input['avatar_url']);
}

	}

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

	}

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

Zeile 1632Zeile 1633
			}

$existing_info = $lang->sprintf($lang->moderate_length, $expired, $color);

			}

$existing_info = $lang->sprintf($lang->moderate_length, $expired, $color);

		}
else
{

		}
else
{

			$existing_info = $lang->moderated_perm;
}
}

			$existing_info = $lang->moderated_perm;
}
}

Zeile 1646Zeile 1647
	// Suspend posts
// Generate check box
$suspost_options = $form->generate_select_box('suspost_period', $periods, $mybb->get_input('suspost_period'), array('id' => 'suspost_period'));

	// Suspend posts
// Generate check box
$suspost_options = $form->generate_select_box('suspost_period', $periods, $mybb->get_input('suspost_period'), array('id' => 'suspost_period'));





	// Do we have any existing suspensions here?
if($user['suspendposting'] || ($mybb->get_input('suspendposting') && !empty($errors)))
{

	// Do we have any existing suspensions here?
if($user['suspendposting'] || ($mybb->get_input('suspendposting') && !empty($errors)))
{

Zeile 1657Zeile 1658
			$existing_info = $lang->suspended_perm;
}
else

			$existing_info = $lang->suspended_perm;
}
else

		{

		{

			$remaining = $user['suspensiontime']-TIME_NOW;
$suspost_date = nice_time($remaining, array('seconds' => false));


			$remaining = $user['suspensiontime']-TIME_NOW;
$suspost_date = nice_time($remaining, array('seconds' => false));


Zeile 1724Zeile 1725
			$("#suspost").show();
}
else if($("#suspendposting").is(":checked") == false)

			$("#suspost").show();
}
else if($("#suspendposting").is(":checked") == false)

		{

		{

			$("#suspost").hide();
}
}

			$("#suspost").hide();
}
}

}


}


if($("#moderateposting").is(":checked") == false)
{
$("#modpost").hide();

if($("#moderateposting").is(":checked") == false)
{
$("#modpost").hide();

}
else

}
else

{
$("#modpost").show();

{
$("#modpost").show();

}

}


if($("#suspendposting").is(":checked") == false)


if($("#suspendposting").is(":checked") == false)

{

{

	$("#suspost").hide();
}
else
{
$("#suspost").show();

	$("#suspost").hide();
}
else
{
$("#suspost").show();

}


}


// -->
</script>';

// -->
</script>';





	$page->output_footer();
}

	$page->output_footer();
}





if($mybb->input['action'] == "delete")
{
$user = get_user($mybb->input['uid']);

if($mybb->input['action'] == "delete")
{
$user = get_user($mybb->input['uid']);

Zeile 1768Zeile 1769
	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');

		admin_redirect("index.php?module=user-users");
}

		admin_redirect("index.php?module=user-users");
}


// User clicked no
if($mybb->get_input('no'))


// User clicked no
if($mybb->get_input('no'))

Zeile 1833Zeile 1834
	$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'])

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

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

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

Zeile 1905Zeile 1906
	$table->construct_row();

if(empty($user['regip']))

	$table->construct_row();

if(empty($user['regip']))

	{

	{

		$user['regip'] = $lang->unknown;
$controls = '';
}

		$user['regip'] = $lang->unknown;
$controls = '';
}

Zeile 1950Zeile 1951
if($mybb->input['action'] == "merge")
{
$plugins->run_hooks("admin_user_users_merge");

if($mybb->input['action'] == "merge")
{
$plugins->run_hooks("admin_user_users_merge");





	if($mybb->request_method == "post")
{
foreach(array('source', 'destination') as $target)

	if($mybb->request_method == "post")
{
foreach(array('source', 'destination') as $target)

Zeile 1973Zeile 1974
		{
$errors[] = $lang->error_cannot_merge_same_account;
}

		{
$errors[] = $lang->error_cannot_merge_same_account;
}





		if(empty($errors))
{
// Begin to merge the accounts

		if(empty($errors))
{
// Begin to merge the accounts

Zeile 2084Zeile 2085
			$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("

			$query = $db->query("

				SELECT SUM(points) as warn_lev
FROM ".TABLE_PREFIX."warnings
WHERE uid='{$source_user['uid']}' AND expired='0'

				SELECT SUM(points) as warn_lev
FROM ".TABLE_PREFIX."warnings
WHERE uid='{$source_user['uid']}' AND expired='0'

Zeile 2726Zeile 2727
			}
else
{

			}
else
{

				if($mybb->input['processed'] == 1)

				if(isset($mybb->input['processed']))

				{
// Set up user handler.
require_once MYBB_ROOT.'inc/datahandlers/user.php';

				{
// Set up user handler.
require_once MYBB_ROOT.'inc/datahandlers/user.php';

Zeile 2804Zeile 2805
					{
case '1':
$threshold = $base_time * 31; // 1 month = 31 days, in the standard terms

					{
case '1':
$threshold = $base_time * 31; // 1 month = 31 days, in the standard terms

							break;

							break;

						case '2':
$threshold = $base_time * 93; // 3 months = 31 days * 3
break;

						case '2':
$threshold = $base_time * 93; // 3 months = 31 days * 3
break;

Zeile 2848Zeile 2849
						if(is_super_admin($user['uid']) && !is_super_admin($mybb->user['uid']))
{
continue;

						if(is_super_admin($user['uid']) && !is_super_admin($mybb->user['uid']))
{
continue;

						}


						}


						$return_array = delete_user_posts($user['uid'], $date); // Delete user posts, and grab a list of threads to delete
if($return_array && is_array($return_array))
{
$prune_array = array_merge_recursive($prune_array, $return_array);
}

						$return_array = delete_user_posts($user['uid'], $date); // Delete user posts, and grab a list of threads to delete
if($return_array && is_array($return_array))
{
$prune_array = array_merge_recursive($prune_array, $return_array);
}

					}

$plugins->run_hooks("admin_user_multiprune_threads", $prune_array);


					}

$plugins->run_hooks("admin_user_multiprune_threads", $prune_array);


					// No posts were found for the user, return error
if(!is_array($prune_array) || count($prune_array) == 0)
{

					// No posts were found for the user, return error
if(!is_array($prune_array) || count($prune_array) == 0)
{

Zeile 2872Zeile 2873

// We've finished deleting user's posts, so let's delete the threads
if(is_array($prune_array['to_delete']) && count($prune_array['to_delete']) > 0)


// We've finished deleting user's posts, so let's delete the threads
if(is_array($prune_array['to_delete']) && count($prune_array['to_delete']) > 0)

					{

					{

						foreach($prune_array['to_delete'] as $tid)

						foreach($prune_array['to_delete'] as $tid)

						{

						{

							$db->delete_query("threads", "tid='$tid'");
$db->delete_query("threads", "closed='moved|$tid'");
$db->delete_query("threadsubscriptions", "tid='$tid'");
$db->delete_query("polls", "tid='$tid'");
$db->delete_query("threadsread", "tid='$tid'");
$db->delete_query("threadratings", "tid='$tid'");

							$db->delete_query("threads", "tid='$tid'");
$db->delete_query("threads", "closed='moved|$tid'");
$db->delete_query("threadsubscriptions", "tid='$tid'");
$db->delete_query("polls", "tid='$tid'");
$db->delete_query("threadsread", "tid='$tid'");
$db->delete_query("threadratings", "tid='$tid'");

						}

						}

					}

// After deleting threads, rebuild the thread counters for the affected threads

					}

// After deleting threads, rebuild the thread counters for the affected threads

Zeile 2892Zeile 2893
						while($thread = $db->fetch_array($query))
{
rebuild_thread_counters($thread['tid']);

						while($thread = $db->fetch_array($query))
{
rebuild_thread_counters($thread['tid']);

						}
}


						}
}


					// After updating thread counters, update the affected forum counters
if(is_array($prune_array['forum_update']) && count($prune_array['forum_update']) > 0)
{

					// After updating thread counters, update the affected forum counters
if(is_array($prune_array['forum_update']) && count($prune_array['forum_update']) > 0)
{

Zeile 2939Zeile 2940
			echo $form->generate_hidden_field('action', 'inline_edit');
echo $form->generate_hidden_field('inline_action', 'multiprune');
echo $form->generate_hidden_field('processed', '1');

			echo $form->generate_hidden_field('action', 'inline_edit');
echo $form->generate_hidden_field('inline_action', 'multiprune');
echo $form->generate_hidden_field('processed', '1');





			$form_container = new FormContainer($lang->mass_prune_posts);

// Generate a list of days (1 - 31)

			$form_container = new FormContainer($lang->mass_prune_posts);

// Generate a list of days (1 - 31)

Zeile 2948Zeile 2949
			for($i = 1; $i <= 31; ++$i)
{
$day_options[] = $i;

			for($i = 1; $i <= 31; ++$i)
{
$day_options[] = $i;

			}

			}


// Generate a list of months (1 - 12)
$month_options = array();


// Generate a list of months (1 - 12)
$month_options = array();

Zeile 2961Zeile 2962
			$date_box = $form->generate_select_box('day', $day_options, $mybb->input['day']);
$month_box = $form->generate_select_box('month', $month_options, $mybb->input['month']);
$year_box = $form->generate_numeric_field('year', $mybb->input['year'], array('id' => 'year', 'style' => 'width: 50px;', 'min' => 0));

			$date_box = $form->generate_select_box('day', $day_options, $mybb->input['day']);
$month_box = $form->generate_select_box('month', $month_options, $mybb->input['month']);
$year_box = $form->generate_numeric_field('year', $mybb->input['year'], array('id' => 'year', 'style' => 'width: 50px;', 'min' => 0));





			$prune_select = $date_box.$month_box.$year_box;
$form_container->output_row($lang->manual_date, "", $prune_select, 'date');

			$prune_select = $date_box.$month_box.$year_box;
$form_container->output_row($lang->manual_date, "", $prune_select, 'date');





			// Generate the set date box
$set_options = array();
$set_options[] = $lang->set_an_option;

			// Generate the set date box
$set_options = array();
$set_options[] = $lang->set_an_option;

Zeile 2983Zeile 2984
			$page->output_footer();
break;
case 'multiusergroup':

			$page->output_footer();
break;
case 'multiusergroup':

			if($mybb->input['processed'] == 1)

			if($mybb->get_input('processed', \MyBB::INPUT_INT) === 1)

			{
// Determine additional usergroups
if(is_array($mybb->input['additionalgroups']))

			{
// Determine additional usergroups
if(is_array($mybb->input['additionalgroups']))

Zeile 3083Zeile 3084
				$display_group_options[$usergroup['gid']] = htmlspecialchars_uni($usergroup['title']);
}


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


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

			if(!$mybb->get_input('additionalgroups', \MyBB::INPUT_ARRAY))

			{

			{

				$mybb->input['additionalgroups'] = explode(',', $mybb->input['additionalgroups']);

				$mybb->input['additionalgroups'] = explode(',', $mybb->get_input('additionalgroups'));

			}


			}


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

			$form_container->output_row($lang->primary_user_group, "", $form->generate_select_box('usergroup', $options, $mybb->get_input('usergroup'), array('id' => 'usergroup')), 'usergroup');

			$form_container->output_row($lang->additional_user_groups, $lang->additional_user_groups_desc, $form->generate_select_box('additionalgroups[]', $options, $mybb->input['additionalgroups'], array('id' => 'additionalgroups', 'multiple' => true, 'size' => 5)), 'additionalgroups');
$form_container->output_row($lang->display_user_group, "", $form->generate_select_box('displaygroup', $display_group_options, $mybb->input['displaygroup'], array('id' => 'displaygroup')), 'displaygroup');


			$form_container->output_row($lang->additional_user_groups, $lang->additional_user_groups_desc, $form->generate_select_box('additionalgroups[]', $options, $mybb->input['additionalgroups'], array('id' => 'additionalgroups', 'multiple' => true, 'size' => 5)), 'additionalgroups');
$form_container->output_row($lang->display_user_group, "", $form->generate_select_box('displaygroup', $display_group_options, $mybb->input['displaygroup'], array('id' => 'displaygroup')), 'displaygroup');


Zeile 3309Zeile 3310
	// 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", "skype", "google", "signature", "usertitle");

	$user_like_fields = array("username", "email", "website", "skype", "google", "signature", "usertitle");

	foreach($user_like_fields as $search_field)
{
if(!empty($view['conditions'][$search_field]) && empty($view['conditions'][$search_field.'_blank']))

	foreach($user_like_fields as $search_field)
{
if(!empty($view['conditions'][$search_field]) && empty($view['conditions'][$search_field.'_blank']))

Zeile 3864Zeile 3865
	}

$built_view .= '

	}

$built_view .= '

<script type="text/javascript" src="'.$mybb->settings['bburl'].'/jscripts/inline_moderation.js?ver=1821"></script>

<script type="text/javascript" src="'.$mybb->settings['bburl'].'/jscripts/inline_moderation.js?ver=1838"></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 4217Zeile 4218
		$input['conditions'] = (array)my_unserialize($input['conditions']);
}


		$input['conditions'] = (array)my_unserialize($input['conditions']);
}


	$array = array('username', 'email', 'usergroup', 'website', 'website_blank', 'icq', 'icq_blank', 'skype', 'skype_blank', 'google', 'google_blank', 'signature', 'signature_blank', 'usertitle', 'usertitle_blank', 'postnum_dir', 'postnum', 'threadnum_dir', 'threadnum', 'regdate', 'regip', 'lastip', 'postip');

	$array = array('username', 'email', 'usergroup', 'website', 'website_blank', 'skype', 'skype_blank', 'google', 'google_blank', 'signature', 'signature_blank', 'usertitle', 'usertitle_blank', 'postnum_dir', 'postnum', 'threadnum_dir', 'threadnum', 'regdate', 'regip', 'lastip', 'postip');

	foreach($array as $condition)
{
if(!isset($input['conditions'][$condition]))

	foreach($array as $condition)
{
if(!isset($input['conditions'][$condition]))

Zeile 4260Zeile 4261
	$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->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->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->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->skype_contains, "", $form->generate_text_box('conditions[skype]', $input['conditions']['skype'], array('id' => 'skype'))." {$lang->or} ".$form->generate_check_box('conditions[skype_blank]', 1, $lang->is_not_blank, array('id' => 'skype_blank', 'checked' => $input['conditions']['skype_blank'])), 'skype');
$form_container->output_row($lang->google_contains, "", $form->generate_text_box('conditions[google]', $input['conditions']['google'], array('id' => 'google'))." {$lang->or} ".$form->generate_check_box('conditions[google_blank]', 1, $lang->is_not_blank, array('id' => 'google_blank', 'checked' => $input['conditions']['google_blank'])), 'google');
$form_container->output_row($lang->signature_contains, "", $form->generate_text_box('conditions[signature]', $input['conditions']['signature'], array('id' => 'signature'))." {$lang->or} ".$form->generate_check_box('conditions[signature_blank]', 1, $lang->is_not_blank, array('id' => 'signature_blank', 'checked' => $input['conditions']['signature_blank'])), 'signature');

	$form_container->output_row($lang->skype_contains, "", $form->generate_text_box('conditions[skype]', $input['conditions']['skype'], array('id' => 'skype'))." {$lang->or} ".$form->generate_check_box('conditions[skype_blank]', 1, $lang->is_not_blank, array('id' => 'skype_blank', 'checked' => $input['conditions']['skype_blank'])), 'skype');
$form_container->output_row($lang->google_contains, "", $form->generate_text_box('conditions[google]', $input['conditions']['google'], array('id' => 'google'))." {$lang->or} ".$form->generate_check_box('conditions[google_blank]', 1, $lang->is_not_blank, array('id' => 'google_blank', 'checked' => $input['conditions']['google_blank'])), 'google');
$form_container->output_row($lang->signature_contains, "", $form->generate_text_box('conditions[signature]', $input['conditions']['signature'], array('id' => 'signature'))." {$lang->or} ".$form->generate_check_box('conditions[signature_blank]', 1, $lang->is_not_blank, array('id' => 'signature_blank', 'checked' => $input['conditions']['signature_blank'])), 'signature');