Vergleich member.php - 1.8.16 - 1.8.20

Keine Änderungen Hinzugefügt Modifiziert Entfernt
Zeile 26	Zeile 26
$templatelist .= ",member_profile_banned_remaining,member_profile_addremove,member_emailuser_guest,member_register_day,usercp_options_tppselect_option,postbit_warninglevel_formatted,member_profile_userstar,member_profile_findposts"; $templatelist .= ",usercp_options_tppselect,usercp_options_pppselect,member_resetpassword,member_login,member_profile_online,usercp_options_pppselect_option,postbit_reputation_formatted,member_emailuser,usercp_profile_profilefields_text"; $templatelist .= ",member_profile_modoptions_ipaddress,member_profile_modoptions,member_profile_banned,member_register_language,member_resendactivation,usercp_profile_profilefields_checkbox,member_register_password,member_coppa_form";	$templatelist .= ",member_profile_banned_remaining,member_profile_addremove,member_emailuser_guest,member_register_day,usercp_options_tppselect_option,postbit_warninglevel_formatted,member_profile_userstar,member_profile_findposts"; $templatelist .= ",usercp_options_tppselect,usercp_options_pppselect,member_resetpassword,member_login,member_profile_online,usercp_options_pppselect_option,postbit_reputation_formatted,member_emailuser,usercp_profile_profilefields_text"; $templatelist .= ",member_profile_modoptions_ipaddress,member_profile_modoptions,member_profile_banned,member_register_language,member_resendactivation,usercp_profile_profilefields_checkbox,member_register_password,member_coppa_form";
	$templatelist .= ",member_profile_modoptions_manageban";
require_once "./global.php"; require_once MYBB_ROOT."inc/functions_post.php";	require_once "./global.php"; require_once MYBB_ROOT."inc/functions_post.php";
Zeile 791	Zeile 792
} $validator_javascript = "<script type=\"text/javascript\">	} $validator_javascript = "<script type=\"text/javascript\">
$(document).ready(function() {	$(function() {
$('#registration_form').validate({ rules: { username: {	$('#registration_form').validate({ rules: { username: {
Zeile 1473	Zeile 1474
eval("\$activate = \"".$templates->get("member_activate")."\";"); output_page($activate);	eval("\$activate = \"".$templates->get("member_activate")."\";"); output_page($activate);
	} } if($mybb->input['action'] == "do_resendactivation" && $mybb->request_method == "post") { $plugins->run_hooks("member_do_resendactivation_start"); if($mybb->settings['regtype'] == "admin") { error($lang->error_activated_by_admin); } $errors = array(); if($mybb->settings['captchaimage']) { require_once MYBB_ROOT.'inc/class_captcha.php'; $captcha = new captcha; if($captcha->validate_captcha() == false) { // CAPTCHA validation failed 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 LEFT JOIN ".TABLE_PREFIX."awaitingactivation a ON (a.uid=u.uid AND a.type='r' OR a.type='b') WHERE u.email='".$db->escape_string($mybb->get_input('email'))."' "); $numusers = $db->num_rows($query); if($numusers < 1) { error($lang->error_invalidemail); } else { if(count($errors) == 0) { while($user = $db->fetch_array($query)) { if($user['type'] == "b" && $user['validated'] == 1) { error($lang->error_activated_by_admin); } if($user['usergroup'] == 5) { if(!$user['code']) { $user['code'] = random_str(); $uid = $user['uid']; $awaitingarray = array( "uid" => $uid, "dateline" => TIME_NOW, "code" => $user['code'], "type" => $user['type'] ); $db->insert_query("awaitingactivation", $awaitingarray); } $username = $user['username']; $email = $user['email']; $activationcode = $user['code']; $emailsubject = $lang->sprintf($lang->emailsubject_activateaccount, $mybb->settings['bbname']); switch($mybb->settings['username_method']) { case 0: $emailmessage = $lang->sprintf($lang->email_activateaccount, $user['username'], $mybb->settings['bbname'], $mybb->settings['bburl'], $user['uid'], $activationcode); break; case 1: $emailmessage = $lang->sprintf($lang->email_activateaccount1, $user['username'], $mybb->settings['bbname'], $mybb->settings['bburl'], $user['uid'], $activationcode); break; case 2: $emailmessage = $lang->sprintf($lang->email_activateaccount2, $user['username'], $mybb->settings['bbname'], $mybb->settings['bburl'], $user['uid'], $activationcode); break; default: $emailmessage = $lang->sprintf($lang->email_activateaccount, $user['username'], $mybb->settings['bbname'], $mybb->settings['bburl'], $user['uid'], $activationcode); break; } my_mail($email, $emailsubject, $emailmessage); } } $plugins->run_hooks("member_do_resendactivation_end"); redirect("index.php", $lang->redirect_activationresent); } else { $mybb->input['action'] = "resendactivation"; }
} } if($mybb->input['action'] == "resendactivation") { $plugins->run_hooks("member_resendactivation");	} } if($mybb->input['action'] == "resendactivation") { $plugins->run_hooks("member_resendactivation");

if($mybb->settings['regtype'] == "admin")	if($mybb->settings['regtype'] == "admin")
{ error($lang->error_activated_by_admin);	{ error($lang->error_activated_by_admin);
}	}

if($mybb->user['uid'] && $mybb->user['usergroup'] != 5)	if($mybb->user['uid'] && $mybb->user['usergroup'] != 5)
{	{
error($lang->error_alreadyactivated);	error($lang->error_alreadyactivated);
}	}
$query = $db->simple_select("awaitingactivation", "*", "uid='".$mybb->user['uid']."' AND type='b'"); $activation = $db->fetch_array($query); if($activation['validated'] == 1) { error($lang->error_activated_by_admin);	$query = $db->simple_select("awaitingactivation", "*", "uid='".$mybb->user['uid']."' AND type='b'"); $activation = $db->fetch_array($query); if($activation['validated'] == 1) { error($lang->error_activated_by_admin);
	} $captcha = ''; // Generate CAPTCHA? if($mybb->settings['captchaimage']) { require_once MYBB_ROOT.'inc/class_captcha.php'; $post_captcha = new captcha(true, "post_captcha"); if($post_captcha->html) { $captcha = $post_captcha->html; } } if(isset($errors) && count($errors) > 0) { $errors = inline_error($errors); $email = htmlspecialchars_uni($mybb->get_input('email')); } else { $errors = ''; $email = '';
} $plugins->run_hooks("member_resendactivation_end"); eval("\$activate = \"".$templates->get("member_resendactivation")."\";"); output_page($activate);	} $plugins->run_hooks("member_resendactivation_end"); eval("\$activate = \"".$templates->get("member_resendactivation")."\";"); output_page($activate);
}	}

if($mybb->input['action'] == "do_resendactivation" && $mybb->request_method == "post")	if($mybb->input['action'] == "do_lostpw" && $mybb->request_method == "post")
{	{
$plugins->run_hooks("member_do_resendactivation_start"); if($mybb->settings['regtype'] == "admin") { error($lang->error_activated_by_admin);	$plugins->run_hooks("member_do_lostpw_start"); $errors = array(); if($mybb->settings['captchaimage']) { require_once MYBB_ROOT.'inc/class_captcha.php'; $captcha = new captcha; if($captcha->validate_captcha() == false) { // CAPTCHA validation failed 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 LEFT JOIN ".TABLE_PREFIX."awaitingactivation a ON (a.uid=u.uid AND a.type='r' OR a.type='b') WHERE u.email='".$db->escape_string($mybb->get_input('email'))."' ");	$email = $db->escape_string($email); $query = $db->simple_select("users", "*", "email='".$db->escape_string($mybb->get_input('email'))."'");
$numusers = $db->num_rows($query); if($numusers < 1) { error($lang->error_invalidemail);	$numusers = $db->num_rows($query); if($numusers < 1) { error($lang->error_invalidemail);
} else { while($user = $db->fetch_array($query)) { if($user['type'] == "b" && $user['validated'] == 1) { error($lang->error_activated_by_admin); } if($user['usergroup'] == 5)	} else { if(count($errors) == 0) { while($user = $db->fetch_array($query))
{	{
if(!$user['code']) { $user['code'] = random_str(); $uid = $user['uid']; $awaitingarray = array( "uid" => $uid, "dateline" => TIME_NOW, "code" => $user['code'], "type" => $user['type'] ); $db->insert_query("awaitingactivation", $awaitingarray); }	$db->delete_query("awaitingactivation", "uid='{$user['uid']}' AND type='p'"); $user['activationcode'] = random_str(30); $now = TIME_NOW; $uid = $user['uid']; $awaitingarray = array( "uid" => $user['uid'], "dateline" => TIME_NOW, "code" => $user['activationcode'], "type" => "p" ); $db->insert_query("awaitingactivation", $awaitingarray);
$username = $user['username']; $email = $user['email'];	$username = $user['username']; $email = $user['email'];
$activationcode = $user['code']; $emailsubject = $lang->sprintf($lang->emailsubject_activateaccount, $mybb->settings['bbname']);	$activationcode = $user['activationcode']; $emailsubject = $lang->sprintf($lang->emailsubject_lostpw, $mybb->settings['bbname']);
switch($mybb->settings['username_method']) { case 0:	switch($mybb->settings['username_method']) { case 0:
$emailmessage = $lang->sprintf($lang->email_activateaccount, $user['username'], $mybb->settings['bbname'], $mybb->settings['bburl'], $user['uid'], $activationcode);	$emailmessage = $lang->sprintf($lang->email_lostpw, $username, $mybb->settings['bbname'], $mybb->settings['bburl'], $uid, $activationcode);
break; case 1:	break; case 1:
$emailmessage = $lang->sprintf($lang->email_activateaccount1, $user['username'], $mybb->settings['bbname'], $mybb->settings['bburl'], $user['uid'], $activationcode);	$emailmessage = $lang->sprintf($lang->email_lostpw1, $username, $mybb->settings['bbname'], $mybb->settings['bburl'], $uid, $activationcode);