Vergleich admin/modules/user/users.php - 1.8.22 - 1.8.26

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 317Zeile 317
					unset($mybb->input['additionalgroups'][$key]);
}
}

					unset($mybb->input['additionalgroups'][$key]);
}
}

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

			$additionalgroups = implode(",", array_map('intval', $mybb->input['additionalgroups']));

		}
else
{

		}
else
{

Zeile 454Zeile 454
					unset($mybb->input['additionalgroups'][$key]);
}
}

					unset($mybb->input['additionalgroups'][$key]);
}
}

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

			$additionalgroups = implode(",", array_map('intval', $mybb->input['additionalgroups']));

		}
else
{

		}
else
{

Zeile 930Zeile 930

<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=1822"></script>


<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=1822"></script>

	<script type="text/javascript" src="../jscripts/bbcodes_sceditor.js?ver=1822"></script>

	<script type="text/javascript" src="../jscripts/bbcodes_sceditor.js?ver=1824"></script>

	<script type="text/javascript" src="../jscripts/sceditor/plugins/undo.js?ver=1805"></script>
EOF;
$page->output_header($lang->edit_user);

	<script type="text/javascript" src="../jscripts/sceditor/plugins/undo.js?ver=1805"></script>
EOF;
$page->output_header($lang->edit_user);

Zeile 1996Zeile 1996
			$db->update_query("banned", array('admin' => $destination_user['uid']), "admin = '{$source_user['uid']}'");

// Carry over referrals

			$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']}'");









			$db->update_query("users", array("referrer" => $destination_user['uid']), "referrer='{$source_user['uid']}' AND uid!='{$destination_user['uid']}'");
// If destination user has no referrer but source does and source user was not referred by destination user
// or destination user was referred by the source user
if(($destination_user['referrer'] == 0 && $source_user['referrer'] > 0 && $source_user['referrer'] != $destination_user['uid']) || $destination_user['referrer'] == $source_user['uid'])
{
$db->update_query("users", array("referrer" => $source_user['referrer']), "uid='{$destination_user['uid']}'");
}
$query = $db->simple_select("users", "COUNT(uid) as total_referrals", "referrer='{$destination_user['uid']}' AND uid!='{$source_user['uid']}'");
$new_referrals = $db->fetch_field($query, "total_referrals");
$db->update_query("users", array("referrals" => (int)$new_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 2473Zeile 2481
			{
$sql_array = implode(",", $to_update);
$db->write_query("UPDATE ".TABLE_PREFIX."users SET usergroup = '2' WHERE uid IN (".$sql_array.")");

			{
$sql_array = implode(",", $to_update);
$db->write_query("UPDATE ".TABLE_PREFIX."users SET usergroup = '2' WHERE uid IN (".$sql_array.")");





				$cache->update_awaitingactivation();

// send activation mail

				$cache->update_awaitingactivation();

// send activation mail

Zeile 2525Zeile 2533
				{
$updated_group = array(
"usergroup" => $ban['oldgroup'],

				{
$updated_group = array(
"usergroup" => $ban['oldgroup'],

						"additionalgroups" => $ban['oldadditionalgroups'],

						"additionalgroups" => $db->escape_string($ban['oldadditionalgroups']),

						"displaygroup" => $ban['olddisplaygroup']
);
$db->update_query("users", $updated_group, "uid = '".$ban['uid']."'");
$db->delete_query("banned", "uid = '".$ban['uid']."'");
}


						"displaygroup" => $ban['olddisplaygroup']
);
$db->update_query("users", $updated_group, "uid = '".$ban['uid']."'");
$db->delete_query("banned", "uid = '".$ban['uid']."'");
}


				$cache->update_banned();

 
				$cache->update_moderators();

$mybb->input['action'] = "inline_lift";

				$cache->update_moderators();

$mybb->input['action'] = "inline_lift";

Zeile 2604Zeile 2611
							'uid' => $user['uid'],
'gid' => $mybb->get_input('usergroup', MyBB::INPUT_INT),
'oldgroup' => $user['usergroup'],

							'uid' => $user['uid'],
'gid' => $mybb->get_input('usergroup', MyBB::INPUT_INT),
'oldgroup' => $user['usergroup'],

							'oldadditionalgroups' => $user['additionalgroups'],

							'oldadditionalgroups' => $db->escape_string($user['additionalgroups']),

							'olddisplaygroup' => $user['displaygroup'],
'admin' => (int)$mybb->user['uid'],
'dateline' => TIME_NOW,

							'olddisplaygroup' => $user['displaygroup'],
'admin' => (int)$mybb->user['uid'],
'dateline' => TIME_NOW,

Zeile 2626Zeile 2633
					$db->delete_query("forumsubscriptions", "uid = '{$user['uid']}'");
$db->delete_query("threadsubscriptions", "uid = '{$user['uid']}'");


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


					$cache->update_banned();

 
					++$banned_count;
}
$mybb->input['action'] = "inline_banned";

					++$banned_count;
}
$mybb->input['action'] = "inline_banned";

Zeile 2952Zeile 2958
						{
unset($mybb->input['additionalgroups'][$key]);
}

						{
unset($mybb->input['additionalgroups'][$key]);
}

					}

					}


$additionalgroups = implode(",", array_map('intval', $mybb->input['additionalgroups']));
}


$additionalgroups = implode(",", array_map('intval', $mybb->input['additionalgroups']));
}

Zeile 3665Zeile 3671
			$user['lastip'] = my_inet_ntop($db->unescape_binary($user['lastip']));

if($view['view_type'] == "card")

			$user['lastip'] = my_inet_ntop($db->unescape_binary($user['lastip']));

if($view['view_type'] == "card")

			{

			{

				$users .= build_user_view_card($user, $view, $i);
}
else

				$users .= build_user_view_card($user, $view, $i);
}
else

Zeile 3752Zeile 3758
			{
search.trigger('focus');
return false;

			{
search.trigger('focus');
return false;

			}
});


			}
});


		var search = $(\"#search_keywords\");
search.on('focus', function()
{

		var search = $(\"#search_keywords\");
search.on('focus', function()
{

Zeile 3773Zeile 3779
				searched_blur.val('".addcslashes($lang->search_for_user, "'")."');
}
});

				searched_blur.val('".addcslashes($lang->search_for_user, "'")."');
}
});





		// fix the styling used if we have a different default value
if(search.val() != '".addcslashes($lang->search_for_user, "'")."')
{

		// fix the styling used if we have a different default value
if(search.val() != '".addcslashes($lang->search_for_user, "'")."')
{

Zeile 3784Zeile 3790

// Autocompletion for usernames
// TODO Select2


// Autocompletion for usernames
// TODO Select2





	$built_view .= $search->end();

if(isset($pagination))

	$built_view .= $search->end();

if(isset($pagination))

Zeile 3903Zeile 3909
	}

// And build the final card

	}

// And build the final card

 
	$uname = "";
if(in_array('username', $view['fields']))
{
$uname = $user['view']['username'];
}

	$card = "<fieldset id=\"uid_{$user['uid']}\" style=\"width: 47%; float: {$float};\">\n";

	$card = "<fieldset id=\"uid_{$user['uid']}\" style=\"width: 47%; float: {$float};\">\n";

	$card .= "<legend><input type=\"checkbox\" class=\"checkbox\" name=\"inlinemod_{$user['uid']}\" id=\"inlinemod_{$user['uid']}\" value=\"1\" onclick=\"$('#uid_{$user['uid']}').toggleClass('inline_selected');\" /> {$user['view']['username']}</legend>\n";

	$card .= "<legend><input type=\"checkbox\" class=\"checkbox\" name=\"inlinemod_{$user['uid']}\" id=\"inlinemod_{$user['uid']}\" value=\"1\" onclick=\"$('#uid_{$user['uid']}').toggleClass('inline_selected');\" /> {$uname}</legend>\n";

	if($avatar)
{
$card .= "<div class=\"user_avatar\">{$avatar}</div>\n";

	if($avatar)
{
$card .= "<div class=\"user_avatar\">{$avatar}</div>\n";

Zeile 3973Zeile 3984
 */
function output_custom_profile_fields($fields, $values, &$form_container, &$form, $search=false)
{

 */
function output_custom_profile_fields($fields, $values, &$form_container, &$form, $search=false)
{

	global $lang;

	global $lang, $mybb;


if(!is_array($fields))
{


if(!is_array($fields))
{