Vergleich usercp.php - 1.8.6 - 1.8.7

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 2151Zeile 2151
			$s = "?s={$maxheight}&r={$rating}&d=mm";

$updated_avatar = array(

			$s = "?s={$maxheight}&r={$rating}&d=mm";

$updated_avatar = array(

				"avatar" => "http://www.gravatar.com/avatar/{$email}{$s}.jpg",

				"avatar" => "https://www.gravatar.com/avatar/{$email}{$s}",

				"avatardimensions" => "{$maxheight}|{$maxheight}",
"avatartype" => "gravatar"
);

				"avatardimensions" => "{$maxheight}|{$maxheight}",
"avatartype" => "gravatar"
);

Zeile 3221Zeile 3221

$db->insert_query("joinrequests", $joinrequest);



$db->insert_query("joinrequests", $joinrequest);


			foreach($groupleaders[$usergroup['gid']] as $leader)

			if(array_key_exists($usergroup['gid'], $groupleaders))

			{

			{

				// Load language
$lang->set_language($leader['language']);
$lang->load("messages");

$subject = $lang->sprintf($lang->emailsubject_newjoinrequest, $mybb->settings['bbname']);
$message = $lang->sprintf($lang->email_groupleader_joinrequest, $leader['username'], $mybb->user['username'], $usergroup['title'], $mybb->settings['bbname'], $mybb->get_input('reason'), $mybb->settings['bburl'], $leader['gid']);
my_mail($leader['email'], $subject, $message);




				foreach($groupleaders[$usergroup['gid']] as $leader)
{
// Load language
$lang->set_language($leader['language']);
$lang->load("messages");

$subject = $lang->sprintf($lang->emailsubject_newjoinrequest, $mybb->settings['bbname']);
$message = $lang->sprintf($lang->email_groupleader_joinrequest, $leader['username'], $mybb->user['username'], $usergroup['title'], $mybb->settings['bbname'], $mybb->get_input('reason'), $mybb->settings['bburl'], $leader['gid']);
my_mail($leader['email'], $subject, $message);
}

			}

// Load language

			}

// Load language

Zeile 3246Zeile 3249
			eval("\$joinpage = \"".$templates->get("usercp_usergroups_joingroup")."\";");
output_page($joinpage);
exit;

			eval("\$joinpage = \"".$templates->get("usercp_usergroups_joingroup")."\";");
output_page($joinpage);
exit;

		}
else

		}
else

		{
join_usergroup($mybb->user['uid'], $mybb->get_input('joingroup', MyBB::INPUT_INT));
$plugins->run_hooks("usercp_usergroups_join_group");

		{
join_usergroup($mybb->user['uid'], $mybb->get_input('joingroup', MyBB::INPUT_INT));
$plugins->run_hooks("usercp_usergroups_join_group");

Zeile 3257Zeile 3260

// Accepting invitation
if($mybb->get_input('acceptinvite', MyBB::INPUT_INT))


// Accepting invitation
if($mybb->get_input('acceptinvite', MyBB::INPUT_INT))

	{

	{

		// Verify incoming POST request
verify_post_check($mybb->get_input('my_post_key'));

		// Verify incoming POST request
verify_post_check($mybb->get_input('my_post_key'));





		$usergroup = $usergroups[$mybb->get_input('acceptinvite', MyBB::INPUT_INT)];

		$usergroup = $usergroups[$mybb->get_input('acceptinvite', MyBB::INPUT_INT)];





		if(my_strpos($ingroups, ",".$mybb->get_input('acceptinvite', MyBB::INPUT_INT).",") !== false)
{
error($lang->already_accepted_invite);

		if(my_strpos($ingroups, ",".$mybb->get_input('acceptinvite', MyBB::INPUT_INT).",") !== false)
{
error($lang->already_accepted_invite);

		}


		}


		$query = $db->simple_select("joinrequests", "*", "uid='".$mybb->user['uid']."' AND gid='".$mybb->get_input('acceptinvite', MyBB::INPUT_INT)."' AND invite='1'");
$joinrequest = $db->fetch_array($query);
if($joinrequest['rid'])

		$query = $db->simple_select("joinrequests", "*", "uid='".$mybb->user['uid']."' AND gid='".$mybb->get_input('acceptinvite', MyBB::INPUT_INT)."' AND invite='1'");
$joinrequest = $db->fetch_array($query);
if($joinrequest['rid'])

Zeile 3296Zeile 3299
				FROM ".TABLE_PREFIX."groupleaders l
LEFT JOIN ".TABLE_PREFIX."usergroups g ON(g.gid=l.gid)
LEFT JOIN ".TABLE_PREFIX."users u ON(((','|| u.additionalgroups|| ',' LIKE '%,'|| g.gid|| ',%') OR u.usergroup = g.gid))

				FROM ".TABLE_PREFIX."groupleaders l
LEFT JOIN ".TABLE_PREFIX."usergroups g ON(g.gid=l.gid)
LEFT JOIN ".TABLE_PREFIX."users u ON(((','|| u.additionalgroups|| ',' LIKE '%,'|| g.gid|| ',%') OR u.usergroup = g.gid))

				LEFT JOIN ".TABLE_PREFIX."joinrequests j ON(j.gid=g.gid AND j.uid != 0)
WHERE l.uid='".$mybb->user['uid']."'
GROUP BY g.gid, g.title, g.type, l.canmanagerequests, l.canmanagemembers, l.caninvitemembers

				LEFT JOIN ".TABLE_PREFIX."joinrequests j ON(j.gid=g.gid AND j.uid != 0)
WHERE l.uid='".$mybb->user['uid']."'
GROUP BY g.gid, g.title, g.type, l.canmanagerequests, l.canmanagemembers, l.caninvitemembers

			");
break;
default:

			");
break;
default:

Zeile 3309Zeile 3312
				LEFT JOIN ".TABLE_PREFIX."users u ON(((CONCAT(',', u.additionalgroups, ',') LIKE CONCAT('%,', g.gid, ',%')) OR u.usergroup = g.gid))
LEFT JOIN ".TABLE_PREFIX."joinrequests j ON(j.gid=g.gid AND j.uid != 0)
WHERE l.uid='".$mybb->user['uid']."'

				LEFT JOIN ".TABLE_PREFIX."users u ON(((CONCAT(',', u.additionalgroups, ',') LIKE CONCAT('%,', g.gid, ',%')) OR u.usergroup = g.gid))
LEFT JOIN ".TABLE_PREFIX."joinrequests j ON(j.gid=g.gid AND j.uid != 0)
WHERE l.uid='".$mybb->user['uid']."'

				GROUP BY l.gid

				GROUP BY g.gid, g.title, g.type, l.canmanagerequests, l.canmanagemembers, l.caninvitemembers

			");
}


			");
}


Zeile 3675Zeile 3678
	$regdate = my_date('relative', $mybb->user['regdate']);

$useravatar = format_avatar($mybb->user['avatar'], $mybb->user['avatardimensions'], '100x100');

	$regdate = my_date('relative', $mybb->user['regdate']);

$useravatar = format_avatar($mybb->user['avatar'], $mybb->user['avatardimensions'], '100x100');

 
	$avatar_username = htmlspecialchars_uni($mybb->user['username']);

	eval("\$avatar = \"".$templates->get("usercp_currentavatar")."\";");

$usergroup = htmlspecialchars_uni($groupscache[$mybb->user['usergroup']]['title']);

	eval("\$avatar = \"".$templates->get("usercp_currentavatar")."\";");

$usergroup = htmlspecialchars_uni($groupscache[$mybb->user['usergroup']]['title']);