Vergleich member.php - 1.6.5 - 1.6.8

Keine Änderungen Hinzugefügt Modifiziert Entfernt
Zeile 6	Zeile 6
* Website: http://mybb.com * License: http://mybb.com/about/license *	* Website: http://mybb.com * License: http://mybb.com/about/license *
* $Id: member.php 5616 2011-09-20 13:24:59Z Tomm $	* $Id: member.php 5784 2012-04-19 12:57:48Z Tomm $
*/ define("IN_MYBB", 1);	*/ define("IN_MYBB", 1);
Zeile 277	Zeile 277
); $db->insert_query("awaitingactivation", $activationarray); $emailsubject = $lang->sprintf($lang->emailsubject_activateaccount, $mybb->settings['bbname']);	); $db->insert_query("awaitingactivation", $activationarray); $emailsubject = $lang->sprintf($lang->emailsubject_activateaccount, $mybb->settings['bbname']);
$emailmessage = $lang->sprintf($lang->email_activateaccount, $user_info['username'], $mybb->settings['bbname'], $mybb->settings['bburl'], $user_info['uid'], $activationcode);	switch($mybb->settings['username_method']) { case 0: $emailmessage = $lang->sprintf($lang->email_activateaccount, $user_info['username'], $mybb->settings['bbname'], $mybb->settings['bburl'], $user_info['uid'], $activationcode); break; case 1: $emailmessage = $lang->sprintf($lang->email_activateaccount1, $user_info['username'], $mybb->settings['bbname'], $mybb->settings['bburl'], $user_info['uid'], $activationcode); break; case 2: $emailmessage = $lang->sprintf($lang->email_activateaccount2, $user_info['username'], $mybb->settings['bbname'], $mybb->settings['bburl'], $user_info['uid'], $activationcode); break; default: $emailmessage = $lang->sprintf($lang->email_activateaccount, $user_info['username'], $mybb->settings['bbname'], $mybb->settings['bburl'], $user_info['uid'], $activationcode); break; }
my_mail($user_info['email'], $emailsubject, $emailmessage); $lang->redirect_registered_activation = $lang->sprintf($lang->redirect_registered_activation, $mybb->settings['bbname'], $user_info['username']);	my_mail($user_info['email'], $emailsubject, $emailmessage); $lang->redirect_registered_activation = $lang->sprintf($lang->redirect_registered_activation, $mybb->settings['bbname'], $user_info['username']);

$plugins->run_hooks("member_do_register_end"); error($lang->redirect_registered_activation);	$plugins->run_hooks("member_do_register_end"); error($lang->redirect_registered_activation);
Zeile 289	Zeile 303
else if($mybb->settings['regtype'] == "randompass") { $emailsubject = $lang->sprintf($lang->emailsubject_randompassword, $mybb->settings['bbname']);	else if($mybb->settings['regtype'] == "randompass") { $emailsubject = $lang->sprintf($lang->emailsubject_randompassword, $mybb->settings['bbname']);
$emailmessage = $lang->sprintf($lang->email_randompassword, $user['username'], $mybb->settings['bbname'], $user_info['username'], $user_info['password']);	switch($mybb->settings['username_method']) { case 0: $emailmessage = $lang->sprintf($lang->email_randompassword, $user['username'], $mybb->settings['bbname'], $user_info['username'], $user_info['password']); break; case 1: $emailmessage = $lang->sprintf($lang->email_randompassword1, $user['username'], $mybb->settings['bbname'], $user_info['username'], $user_info['password']); break; case 2: $emailmessage = $lang->sprintf($lang->email_randompassword2, $user['username'], $mybb->settings['bbname'], $user_info['username'], $user_info['password']); break; default: $emailmessage = $lang->sprintf($lang->email_randompassword, $user['username'], $mybb->settings['bbname'], $user_info['username'], $user_info['password']); break; }
my_mail($user_info['email'], $emailsubject, $emailmessage);	my_mail($user_info['email'], $emailsubject, $emailmessage);
$plugins->run_hooks("member_do_register_end");	$plugins->run_hooks("member_do_register_end");
error($lang->redirect_registered_passwordsent); } else if($mybb->settings['regtype'] == "admin") { $lang->redirect_registered_admin_activate = $lang->sprintf($lang->redirect_registered_admin_activate, $mybb->settings['bbname'], $user_info['username']);	error($lang->redirect_registered_passwordsent); } else if($mybb->settings['regtype'] == "admin") { $lang->redirect_registered_admin_activate = $lang->sprintf($lang->redirect_registered_admin_activate, $mybb->settings['bbname'], $user_info['username']);

$plugins->run_hooks("member_do_register_end"); error($lang->redirect_registered_admin_activate);	$plugins->run_hooks("member_do_register_end"); error($lang->redirect_registered_admin_activate);
} else {	} else {
$lang->redirect_registered = $lang->sprintf($lang->redirect_registered, $mybb->settings['bbname'], $user_info['username']); $plugins->run_hooks("member_do_register_end");	$lang->redirect_registered = $lang->sprintf($lang->redirect_registered, $mybb->settings['bbname'], $user_info['username']); $plugins->run_hooks("member_do_register_end");
Zeile 355	Zeile 383
{ // Just selected DOB, we check if($mybb->input['bday1'] && $mybb->input['bday2'] && $mybb->input['bday3'])	{ // Just selected DOB, we check if($mybb->input['bday1'] && $mybb->input['bday2'] && $mybb->input['bday3'])
{ my_unsetcookie("coppauser");	{ my_unsetcookie("coppauser");
$bdaytime = @mktime(0, 0, 0, $mybb->input['bday2'], $mybb->input['bday1'], $mybb->input['bday3']); // Store DOB in cookie so we can save it with the registration	$bdaytime = @mktime(0, 0, 0, $mybb->input['bday2'], $mybb->input['bday1'], $mybb->input['bday3']); // Store DOB in cookie so we can save it with the registration
Zeile 381	Zeile 409
eval("\$coppa = \"".$templates->get("member_register_coppa")."\";"); output_page($coppa); exit;	eval("\$coppa = \"".$templates->get("member_register_coppa")."\";"); output_page($coppa); exit;
} }	} }
if((!isset($mybb->input['agree']) && !isset($mybb->input['regsubmit'])) \|\| $mybb->request_method != "post") { // Is this user a COPPA user? We need to show the COPPA agreement too	if((!isset($mybb->input['agree']) && !isset($mybb->input['regsubmit'])) \|\| $mybb->request_method != "post") { // Is this user a COPPA user? We need to show the COPPA agreement too
Zeile 396	Zeile 424
$lang->coppa_agreement_1 = $lang->sprintf($lang->coppa_agreement_1, $mybb->settings['bbname']); eval("\$coppa_agreement = \"".$templates->get("member_register_agreement_coppa")."\";"); }	$lang->coppa_agreement_1 = $lang->sprintf($lang->coppa_agreement_1, $mybb->settings['bbname']); eval("\$coppa_agreement = \"".$templates->get("member_register_agreement_coppa")."\";"); }

$plugins->run_hooks("member_register_agreement"); eval("\$agreement = \"".$templates->get("member_register_agreement")."\";");	$plugins->run_hooks("member_register_agreement"); eval("\$agreement = \"".$templates->get("member_register_agreement")."\";");
Zeile 409	Zeile 437
$validator_extra = ''; if(isset($mybb->input['timezoneoffset']))	$validator_extra = ''; if(isset($mybb->input['timezoneoffset']))
{	{
$timezoneoffset = $mybb->input['timezoneoffset']; } else	$timezoneoffset = $mybb->input['timezoneoffset']; } else
{	{
$timezoneoffset = $mybb->settings['timezoneoffset']; } $tzselect = build_timezone_select("timezoneoffset", $timezoneoffset, true);	$timezoneoffset = $mybb->settings['timezoneoffset']; } $tzselect = build_timezone_select("timezoneoffset", $timezoneoffset, true);
Zeile 435	Zeile 463
eval("\$tppselect = \"".$templates->get("usercp_options_tppselect")."\";"); } if($mybb->settings['userpppoptions'])	eval("\$tppselect = \"".$templates->get("usercp_options_tppselect")."\";"); } if($mybb->settings['userpppoptions'])
{	{