| Zeile 391 | Zeile 391 |
|---|
$captcha->invalidate_captcha();
}
|
$captcha->invalidate_captcha();
}
|
if($mybb->settings['regtype'] != "randompass" && !isset($mybb->cookies['coppauser']))
| if($mybb->settings['regtype'] != "randompass" && empty($mybb->cookies['coppauser']))
|
{
// Log them in
my_setcookie("mybbuser", $user_info['uid']."_".$user_info['loginkey'], null, true, "lax");
}
|
{
// Log them in
my_setcookie("mybbuser", $user_info['uid']."_".$user_info['loginkey'], null, true, "lax");
}
|
if(isset($mybb->cookies['coppauser']))
| if(!empty($mybb->cookies['coppauser']))
|
{
$lang->redirect_registered_coppa_activate = $lang->sprintf($lang->redirect_registered_coppa_activate, $mybb->settings['bbname'], htmlspecialchars_uni($user_info['username']));
my_unsetcookie("coppauser");
| {
$lang->redirect_registered_coppa_activate = $lang->sprintf($lang->redirect_registered_coppa_activate, $mybb->settings['bbname'], htmlspecialchars_uni($user_info['username']));
my_unsetcookie("coppauser");
|
| Zeile 718 | Zeile 718 |
|---|
$birthday_year = '';
}
|
$birthday_year = '';
}
|
| | $under_thirteen = false;
|
// Is COPPA checking enabled?
if($mybb->settings['coppa'] != "disabled" && !isset($mybb->input['step']))
{
| // Is COPPA checking enabled?
if($mybb->settings['coppa'] != "disabled" && !isset($mybb->input['step']))
{
|
| Zeile 742 | Zeile 744 |
|---|
{
my_setcookie("coppauser", 1, -0);
$under_thirteen = true;
|
{
my_setcookie("coppauser", 1, -0);
$under_thirteen = true;
|
| | }
else
{
my_setcookie("coppauser", 0, -0);
|
}
$mybb->request_method = "";
}
| }
$mybb->request_method = "";
}
|
| Zeile 763 | Zeile 769 |
|---|
{
$coppa_agreement = '';
// Is this user a COPPA user? We need to show the COPPA agreement too
|
{
$coppa_agreement = '';
// Is this user a COPPA user? We need to show the COPPA agreement too
|
if($mybb->settings['coppa'] != "disabled" && ($mybb->cookies['coppauser'] == 1 || $under_thirteen))
| if($mybb->settings['coppa'] != "disabled" && (!empty($mybb->cookies['coppauser']) || $under_thirteen))
|
{
if($mybb->settings['coppa'] == "deny")
{
| {
if($mybb->settings['coppa'] == "deny")
{
|
| Zeile 849 | Zeile 855 |
|---|
elseif(!empty($referrername))
{
$ref = get_user_by_username($referrername);
|
elseif(!empty($referrername))
{
$ref = get_user_by_username($referrername);
|
if(!$ref['uid'])
| if(!$ref)
|
{
$errors[] = $lang->error_badreferrer;
}
| {
$errors[] = $lang->error_badreferrer;
}
|
| Zeile 974 | Zeile 980 |
|---|
eval("\$select .= \"".$templates->get("usercp_profile_profilefields_select_option")."\";");
}
|
eval("\$select .= \"".$templates->get("usercp_profile_profilefields_select_option")."\";");
}
|
if(!$profilefield['length'])
{
$profilefield['length'] = 1;
}
| if(!$profilefield['length'])
{
$profilefield['length'] = 1;
}
|
eval("\$code = \"".$templates->get("usercp_profile_profilefields_select")."\";");
}
|
eval("\$code = \"".$templates->get("usercp_profile_profilefields_select")."\";");
}
|
| Zeile 1277 | Zeile 1283 |
|---|
{
$query = $db->simple_select("awaitingactivation", "*", "uid='".$user['uid']."' AND (type='r' OR type='e' OR type='b')");
$activation = $db->fetch_array($query);
|
{
$query = $db->simple_select("awaitingactivation", "*", "uid='".$user['uid']."' AND (type='r' OR type='e' OR type='b')");
$activation = $db->fetch_array($query);
|
if(!$activation['uid'])
| if(!$activation)
|
{
error($lang->error_alreadyactivated);
}
| {
error($lang->error_alreadyactivated);
}
|
| Zeile 1324 | Zeile 1330 |
|---|
$plugins->run_hooks("member_activate_accountactivated");
redirect("index.php", $lang->redirect_accountactivated);
|
$plugins->run_hooks("member_activate_accountactivated");
redirect("index.php", $lang->redirect_accountactivated);
|
}
| }
|
}
else
{
| }
else
{
|
| Zeile 1350 | Zeile 1356 |
|---|
if($mybb->settings['regtype'] == "admin")
{
error($lang->error_activated_by_admin);
|
if($mybb->settings['regtype'] == "admin")
{
error($lang->error_activated_by_admin);
|
}
$errors = array();
| }
$errors = array();
|
if($mybb->settings['captchaimage'])
{
require_once MYBB_ROOT.'inc/class_captcha.php';
| if($mybb->settings['captchaimage'])
{
require_once MYBB_ROOT.'inc/class_captcha.php';
|
| Zeile 1365 | Zeile 1371 |
|---|
foreach($captcha->get_errors() as $error)
{
$errors[] = $error;
|
foreach($captcha->get_errors() as $error)
{
$errors[] = $error;
|
}
}
}
| }
}
}
|
$query = $db->query("
SELECT u.uid, u.username, u.usergroup, u.email, a.code, a.type, a.validated
FROM ".TABLE_PREFIX."users u
| $query = $db->query("
SELECT u.uid, u.username, u.usergroup, u.email, a.code, a.type, a.validated
FROM ".TABLE_PREFIX."users u
|
| Zeile 1440 | Zeile 1446 |
|---|
}
if($mybb->input['action'] == "resendactivation")
|
}
if($mybb->input['action'] == "resendactivation")
|
{
| {
|
$plugins->run_hooks("member_resendactivation");
if($mybb->settings['regtype'] == "admin")
| $plugins->run_hooks("member_resendactivation");
if($mybb->settings['regtype'] == "admin")
|
| Zeile 1456 | Zeile 1462 |
|---|
$query = $db->simple_select("awaitingactivation", "*", "uid='".$mybb->user['uid']."' AND type='b'");
$activation = $db->fetch_array($query);
|
$query = $db->simple_select("awaitingactivation", "*", "uid='".$mybb->user['uid']."' AND type='b'");
$activation = $db->fetch_array($query);
|
if($activation['validated'] == 1)
| if($activation && $activation['validated'] == 1)
|
{
error($lang->error_activated_by_admin);
}
| {
error($lang->error_activated_by_admin);
}
|
| Zeile 1469 | Zeile 1475 |
|---|
$post_captcha = new captcha(true, "post_captcha");
if($post_captcha->html)
|
$post_captcha = new captcha(true, "post_captcha");
if($post_captcha->html)
|
{
| {
|
$captcha = $post_captcha->html;
}
|
$captcha = $post_captcha->html;
}
|
}
| }
|
if(isset($errors) && count($errors) > 0)
|
if(isset($errors) && count($errors) > 0)
|
{
| {
|
$errors = inline_error($errors);
$email = htmlspecialchars_uni($mybb->get_input('email'));
}
| $errors = inline_error($errors);
$email = htmlspecialchars_uni($mybb->get_input('email'));
}
|
| Zeile 1483 | Zeile 1489 |
|---|
{
$errors = '';
$email = '';
|
{
$errors = '';
$email = '';
|
}
| }
|
$plugins->run_hooks("member_resendactivation_end");
|
$plugins->run_hooks("member_resendactivation_end");
|
| Zeile 1555 | Zeile 1561 |
|---|
break;
}
my_mail($email, $emailsubject, $emailmessage);
|
break;
}
my_mail($email, $emailsubject, $emailmessage);
|
}
$plugins->run_hooks("member_do_lostpw_end");
| }
$plugins->run_hooks("member_do_lostpw_end");
|
redirect("index.php", $lang->redirect_lostpwsent, "", true);
}
|
redirect("index.php", $lang->redirect_lostpwsent, "", true);
}
|
| Zeile 1586 | Zeile 1592 |
|---|
}
if(isset($errors) && count($errors) > 0)
|
}
if(isset($errors) && count($errors) > 0)
|
{
| {
|
$errors = inline_error($errors);
$email = htmlspecialchars_uni($mybb->get_input('email'));
}
| $errors = inline_error($errors);
$email = htmlspecialchars_uni($mybb->get_input('email'));
}
|
| Zeile 1629 | Zeile 1635 |
|---|
error($lang->error_invalidpworusername);
break;
}
|
error($lang->error_invalidpworusername);
break;
}
|
}
| }
|
}
else
{
| }
else
{
|
| Zeile 1644 | Zeile 1650 |
|---|
if(!$activationcode || $activationcode !== $mybb->get_input('code'))
{
error($lang->error_badlostpwcode);
|
if(!$activationcode || $activationcode !== $mybb->get_input('code'))
{
error($lang->error_badlostpwcode);
|
}
| }
|
$db->delete_query("awaitingactivation", "uid='".$user['uid']."' AND type='p'");
$username = $user['username'];
| $db->delete_query("awaitingactivation", "uid='".$user['uid']."' AND type='p'");
$username = $user['username'];
|
| Zeile 1660 | Zeile 1666 |
|---|
require_once MYBB_ROOT.'inc/datahandlers/user.php';
$userhandler = new UserDataHandler('update');
|
require_once MYBB_ROOT.'inc/datahandlers/user.php';
$userhandler = new UserDataHandler('update');
|
while(!$userhandler->verify_password())
| do
|
{
$password = random_str($password_length, $mybb->settings['requirecomplexpasswords']);
| {
$password = random_str($password_length, $mybb->settings['requirecomplexpasswords']);
|
| Zeile 1673 | Zeile 1679 |
|---|
$userhandler->set_validated(true);
$userhandler->errors = array();
|
$userhandler->set_validated(true);
$userhandler->errors = array();
|
}
| } while(!$userhandler->verify_password());
|
$userhandler->update_user();
$logindetails = array(
'salt' => $userhandler->data['salt'],
|
$userhandler->update_user();
$logindetails = array(
'salt' => $userhandler->data['salt'],
|
'password' => $userhandler->data['saltedpw'],
| 'password' => $userhandler->data['password'],
|
'loginkey' => $userhandler->data['loginkey'],
);
| 'loginkey' => $userhandler->data['loginkey'],
);
|