diff --git a/inc/mail.class.php b/inc/mail.class.php
index 414646d..aedf575 100644
--- a/inc/mail.class.php
+++ b/inc/mail.class.php
@@ -1,7 +1,7 @@
generate_Key(8);
- if($sdata["pwd_sha2'"]!=''){
- $saltetpass=md5(md5($salt).md5($session->generate_Key(15)));
-
- }else{
- $saltetpass=md5(md5($sdata["salt"]).$sdata["pwd_md5"]);
- }
- $db->query("INSERT INTO `" . $this->mybb_conf["prefix"] . "users` (`username`,`salt`,`password`,`loginkey`,`email`,`usergroup`,`birthday`,`regdate`,`regip`,`showsigs`,`showavatars`,`showquickreply`,`showredirect`,`style`,`receivepms`,`allownotices`,`pmnotice`,`pmnotify`,`birthdayprivacy`) VALUES ('".$rdata["username"]."','".$salt."','".$saltetpass."','".$session->generate_Key(50)."','".$sdata["email"]."','2','".date('j-n-Y',$sdata['birthday'])."','".time()."',".$db->escape_binary($functions->my_inet_pton($session->ip)).",'1','1','1','1','3','1','1','1','1','none')");
- $lid=$db->last_id();
- $db->query("UPDATE `" . $config["prefix"] . "users` SET `fuid`='".$lid."' WHERE `uid`='".$sdata["uid"]."'");
- $db->query("INSERT INTO `" . $this->mybb_conf["prefix"] . "userfields` (`ufid`, `fid1`, `fid3`) VALUES ('".$lid."','".$sdata["from"]."','".$sdata["gender"]."')");
+ global $db, $config, $session, $functions;
+ $salt=$session->generate_Key(8);
+ if($sdata["pwd_sha2'"]!=''){
+ $saltetpass=md5(md5($salt).md5($session->generate_Key(15)));
+
+ }else{
+ $saltetpass=md5(md5($sdata["salt"]).$sdata["pwd_md5"]);
+ }
+ $db->query("INSERT INTO `" . $this->mybb_conf["prefix"] . "users` (`username`,`salt`,`password`,`loginkey`,`email`,`usergroup`,`birthday`,`regdate`,`regip`,`showsigs`,`showavatars`,`showquickreply`,`showredirect`,`style`,`receivepms`,`allownotices`,`pmnotice`,`pmnotify`,`birthdayprivacy`,`signature`,`buddylist`,`ignorelist`,`pmfolders`,`notepad`,`usernotes`) VALUES ('".$sdata["username"]."','".$salt."','".$saltetpass."','".$session->generate_Key(50)."','".$sdata["email"]."','2','".date('j-n-Y',$sdata['birthday'])."','".time()."',".$db->escape_binary($functions->my_inet_pton($session->ip)).",'1','1','1','1','3','1','1','1','1','none','','','','0**$%%$1**$%%$2**$%%$3**$%%$4**','','')");
+ $lid=$db->last_id();
+ $db->query("UPDATE `" . $config["prefix"] . "users` SET `fuid`='".$lid."' WHERE `uid`='".$sdata["uid"]."'");
+ $db->query("INSERT INTO `" . $this->mybb_conf["prefix"] . "userfields` (`ufid`, `fid1`,`fid2`, `fid3`) VALUES ('".$lid."','".$sdata["from"]."','', '".$sdata["gender"]."')");
}
function add($rdata){
@@ -89,7 +89,7 @@ class plugins_mybb {
}else{
$saltetpass=md5(md5($rdata["salt"]).$rdata["pwd_md5"]);
}
- $db->query("INSERT INTO `" . $this->mybb_conf["prefix"] . "users` (`username`,`salt`,`password`,`loginkey`,`email`,`usergroup`,`regdate`,`regip`,`showsigs`,`showavatars`,`showquickreply`,`showredirect`,`style`,`receivepms`,`allownotices`,`pmnotice`,`pmnotify`) VALUES ('".$rdata["name"]."','".$salt."','".$saltetpass."','".$session->generate_Key(50)."','".$rdata["email"]."','2','".time()."',".$db->escape_binary($functions->my_inet_pton($session->ip)).",'1','1','1','1','3','1','1','1','1')");
+ $db->query("INSERT INTO `" . $this->mybb_conf["prefix"] . "users` (`username`,`salt`,`password`,`loginkey`,`email`,`usergroup`,`regdate`,`regip`,`showsigs`,`showavatars`,`showquickreply`,`showredirect`,`style`,`receivepms`,`allownotices`,`pmnotice`,`pmnotify`,`birthdayprivacy`,`signature`,`buddylist`,`ignorelist`,`pmfolders`,`notepad`,`usernotes`) VALUES ('".$rdata["name"]."','".$salt."','".$saltetpass."','".$session->generate_Key(50)."','".$rdata["email"]."','2','".time()."',".$db->escape_binary($functions->my_inet_pton($session->ip)).",'1','1','1','1','3','1','1','1','1','none','','','','0**$%%$1**$%%$2**$%%$3**$%%$4**','','')");
$lid=$db->last_id();
$db->query("UPDATE `" . $config["prefix"] . "users` SET `fuid`='".$lid."' WHERE `uid`='".$rdata["uid"]."'");
}
diff --git a/register.php b/register.php
index 205d0ed..3cbda1d 100644
--- a/register.php
+++ b/register.php
@@ -67,7 +67,7 @@ if(isset($_POST['submit']) && $_POST['openid']!='' && isset($_POST['openid'])){
$result = $db->query("INSERT INTO `" . $config['prefix'] . "users` (`username`,`openid_identity`,`realname`,`loginkey`,`email`,`active`,`gender`,`from`,`since`,`birthday`) VALUES ('".$db->escape($username)."','".$db->escape($_POST['openid'])."','".$db->escape($_POST['realname'])."', '".$key."', '".$db->escape($_POST['email'])."', '".$active."','".$db->escape($_POST['gender'])."','".$db->escape($_POST['from'])."','".time()."','".strtotime($db->escape($_POST['birthday']))."')");
$uid=$db->last_id();
$sdata=array('uid'=>$uid,'username'=>$db->escape($username),'openid_identity'=>$db->escape($_POST['openid']),'email'=>$db->escape($_POST['email']),'realname'=>$db->escape($_POST['realname']),'gender'=>$db->escape($_POST['gender']),'from'=>$db->escape($_POST['from']),'birthday'=>strtotime($db->escape($_POST['birthday'])));
- $plugin->run_hook('register_openid_end',array('sdata'=>$sdata));
+ $plugin->run_hook('register_openid_end',array($sdata));
$cookiedata['uid'] = $uid;
$cookiedata['loginkey'] = $key;
$cookiedata = base64_encode($cookiedata['uid'] .'_'. $cookiedata['loginkey']);
@@ -78,7 +78,7 @@ if(isset($_POST['submit']) && $_POST['openid']!='' && isset($_POST['openid'])){
}
$db->query("DELETE FROM `" . $config['prefix'] . "sessions` WHERE `ip`='".$db->escape($_SERVER['REMOTE_ADDR'])."'");
$pdata=array('remember'=>$_POST['remember'],'uid'=>$data['uid'],'domain'=>$config['domain']);
- $plugin->run_hook('register_openid_login',array('pdata'=>$pdata));
+ $plugin->run_hook('register_openid_login',array($pdata));
$core->redirect_message('Logged in','You have been successfully logged-in and will be redirected shortly.',TRUE,$config['path'].'/index.php',3);
}else{
$tpl->assign('emsg',$emsg);
@@ -151,7 +151,7 @@ If(isset($_POST['submit'])){
if($config['activation']=='mail'){
$key=$session->generate_Key(10);
$mail=new mail();
- $mail->set_header('From',$config['sitetitle'].' <'.$config['siteemail'].'>');
+ $mail->set_header('From','=?UTF-8?B?'.base64_encode($config['sitetitle']).'?='.' <'.$config['siteemail'].'>');
$tpl->assign('username',$username);
$tpl->assign('sitename',$config['sitetitle']);
$tpl->assign('url','https://'.$config['domain'].'/'.$config['path'].'register.php?activate='.urlencode($username).'&key='.$key);
@@ -166,7 +166,7 @@ If(isset($_POST['submit'])){
$result = $db->query("INSERT INTO `" . $config['prefix'] . "users` (`username`,`realname`,`password`,`salt`,`loginkey`,`email`,`active`,`gender`,`from`,`since`,`birthday`) VALUES ('".$db->escape($username)."','".$db->escape($_POST['realname'])."','".$pass."','".$salt."','".$key."', '".$db->escape($_POST['email'])."', '".$active."','".$db->escape($_POST['gender'])."','".$db->escape($_POST['from'])."','".time()."','".strtotime($db->escape($_POST['birthday']))."')");
$uid=$db->last_id();
$sdata=array('uid'=>$uid,'username'=>$db->escape($username),'salt'=>$salt,'pwd_md5'=>hash('md5',$_POST['password']),'pwd_sha2'=>$pass,'email'=>$db->escape($_POST['email']),'realname'=>$db->escape($_POST['realname']),'gender'=>$db->escape($_POST['gender']),'from'=>$db->escape($_POST['from']),'birthday'=>strtotime($db->escape($_POST['birthday'])));
- $plugin->run_hook('register_end',array('sdata'=>$sdata));
+ $plugin->run_hook('register_end',array($sdata));
$db->query("DELETE FROM `" . $config['prefix'] . "register` WHERE `regstring` = '".$db->escape($_GET['regstring'])."' OR `ip` = '".$db->escape($_SERVER['REMOTE_ADDR'])."'");
if($active==0){
$core->message('Erfolg','Dein Account wurde erstellt und wir haben Dir eine E-Mail gesendet.
Folge den Anweisungen in der E-Mail um deinen Account freizuschalten.',TRUE,$config['path'].'/index.php',3);
diff --git a/themes/austria/register.tpl b/themes/austria/register.tpl
index c8db38b..eacca0d 100644
--- a/themes/austria/register.tpl
+++ b/themes/austria/register.tpl
@@ -30,15 +30,15 @@
/
Geschlecht:
+ Ich stimme den Nutzungsbedingungen und der Datenschutzerklärung zu und bestätige mindestens 16 Jahre alt zu sein.