Merge with rc-botanic-webdev
This commit is contained in:
commit
b60ef2194e
3 changed files with 78 additions and 75 deletions
|
@ -2,71 +2,9 @@
|
||||||
class Users{
|
class Users{
|
||||||
|
|
||||||
public function add_user(){
|
public function add_user(){
|
||||||
// check if values exist
|
|
||||||
if ( isset( $_POST["Username"] ) and isset( $_POST["Password"] ) and isset( $_POST["Email"] ) )
|
|
||||||
{
|
|
||||||
// check values
|
|
||||||
$user = Users :: checkUser( $_POST["Username"] );
|
|
||||||
$pass = Users :: checkPassword( $_POST["Password"] );
|
|
||||||
$cpass = Users :: confirmPassword();
|
|
||||||
$email = Users :: checkEmail( $_POST["Email"] );
|
|
||||||
}else{
|
|
||||||
$user = "";
|
|
||||||
$pass = "";
|
|
||||||
$cpass = "";
|
|
||||||
$email = "";
|
|
||||||
}
|
|
||||||
// if all are good then create user
|
|
||||||
if ( ( $user == "success" ) and ( $pass == "success" ) and ( $cpass == "success" ) and ( $email == "success" ) and ( isset( $_POST["TaC"] ) ) ){
|
|
||||||
$edit = array(
|
|
||||||
'name' => $_POST["Username"],
|
|
||||||
'pass' => $_POST["Password"],
|
|
||||||
'mail' => $_POST["Email"],
|
|
||||||
'init' => $_POST["Email"],
|
|
||||||
'unhashpass' => $_POST["Password"],
|
|
||||||
'status' => 1,
|
|
||||||
'access' => REQUEST_TIME
|
|
||||||
);
|
|
||||||
//user_save( NULL, $edit );
|
|
||||||
header( 'Location: email_sent.php' );
|
|
||||||
exit;
|
|
||||||
}else{
|
|
||||||
$pageElements = array(
|
|
||||||
//'GAME_NAME' => variable_get( 'ryzommanage_game-name', '' ),
|
|
||||||
//'WELCOME_MESSAGE' => variable_get( 'ryzommanage_register-welcome', '' ),
|
|
||||||
'USERNAME' => $user,
|
|
||||||
'PASSWORD' => $pass,
|
|
||||||
'CPASSWORD' => $cpass,
|
|
||||||
'EMAIL' => $email
|
|
||||||
);
|
|
||||||
if ( $user != "success" ){
|
|
||||||
$pageElements['USERNAME_ERROR'] = 'TRUE';
|
|
||||||
}else{
|
|
||||||
$pageElements['USERNAME_ERROR'] = 'FALSE';
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( $pass != "success" ){
|
helpers :: loadtemplate( 'register', $pageElements );
|
||||||
$pageElements['PASSWORD_ERROR'] = 'TRUE';
|
|
||||||
}else{
|
|
||||||
$pageElements['PASSWORD_ERROR'] = 'FALSE';
|
|
||||||
}
|
|
||||||
if ( $cpass != "success" ){
|
|
||||||
$pageElements['CPASSWORD_ERROR'] = 'TRUE';
|
|
||||||
}else{
|
|
||||||
$pageElements['CPASSWORD_ERROR'] = 'FALSE';
|
|
||||||
}
|
|
||||||
if ( $email != "success" ){
|
|
||||||
$pageElements['EMAIL_ERROR'] = 'TRUE';
|
|
||||||
}else{
|
|
||||||
$pageElements['EMAIL_ERROR'] = 'FALSE';
|
|
||||||
}
|
|
||||||
if ( isset( $_POST["TaC"] ) ){
|
|
||||||
$pageElements['TAC_ERROR'] = 'FALSE';
|
|
||||||
}else{
|
|
||||||
$pageElements['TAC_ERROR'] = 'TRUE';
|
|
||||||
}
|
|
||||||
return $pageElements;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -64,8 +64,8 @@ if ( ( $user == "success" ) and ( $pass == "success" ) and ( $cpass == "success"
|
||||||
$pageElements['TAC_ERROR'] = 'TRUE';
|
$pageElements['TAC_ERROR'] = 'TRUE';
|
||||||
}
|
}
|
||||||
if ( helpers :: check_if_game_client() ){
|
if ( helpers :: check_if_game_client() ){
|
||||||
helpers :: loadtemplate( '../../ams_lib/ingame_templates/register.phtml', $pageElements );
|
helpers :: loadtemplate( 'register', $pageElements );
|
||||||
}else{
|
}else{
|
||||||
helpers :: loadtemplate( 'templates/register.phtml', $pageElements );
|
helpers :: loadtemplate( 'register', $pageElements );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,13 +1,78 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
|
||||||
function add_user(){
|
function add_user(){
|
||||||
|
|
||||||
|
if ( isset( $_POST["Username"] ) and isset( $_POST["Password"] ) and isset( $_POST["Email"] ) )
|
||||||
|
{
|
||||||
|
// check values
|
||||||
|
$user = users :: checkUser( $_POST["Username"] );
|
||||||
|
$pass = users :: checkPassword( $_POST["Password"] );
|
||||||
|
$cpass = users :: confirmPassword();
|
||||||
|
$email = users :: checkEmail( $_POST["Email"] );
|
||||||
|
}else{
|
||||||
|
$user = "";
|
||||||
|
$pass = "";
|
||||||
|
$cpass = "";
|
||||||
|
$email = "";
|
||||||
|
}
|
||||||
|
// if all are good then create user
|
||||||
|
if ( ( $user == "success" ) and ( $pass == "success" ) and ( $cpass == "success" ) and ( $email == "success" ) and ( isset( $_POST["TaC"] ) ) ){
|
||||||
|
$edit = array(
|
||||||
|
'name' => $_POST["Username"],
|
||||||
|
'pass' => $_POST["Password"],
|
||||||
|
'mail' => $_POST["Email"],
|
||||||
|
'init' => $_POST["Email"],
|
||||||
|
'unhashpass' => $_POST["Password"],
|
||||||
|
'status' => 1,
|
||||||
|
'access' => REQUEST_TIME
|
||||||
|
);
|
||||||
|
header( 'Location: email_sent.php' );
|
||||||
|
write_user( $edit );
|
||||||
|
exit;
|
||||||
|
}else{
|
||||||
|
$pageElements = array(
|
||||||
|
//'GAME_NAME' => $GAME_NAME,
|
||||||
|
// 'WELCOME_MESSAGE' => $WELCOME_MESSAGE,
|
||||||
|
// 'USERNAME' => $user,
|
||||||
|
// 'PASSWORD' => $pass,
|
||||||
|
// 'CPASSWORD' => $cpass,
|
||||||
|
// 'EMAIL' => $email
|
||||||
|
);
|
||||||
|
if ( $user != "success" ){
|
||||||
|
$pageElements['USERNAME_ERROR'] = 'TRUE';
|
||||||
|
}else{
|
||||||
|
$pageElements['USERNAME_ERROR'] = 'FALSE';
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( $pass != "success" ){
|
||||||
|
$pageElements['PASSWORD_ERROR'] = 'TRUE';
|
||||||
|
}else{
|
||||||
|
$pageElements['PASSWORD_ERROR'] = 'FALSE';
|
||||||
|
}
|
||||||
|
if ( $cpass != "success" ){
|
||||||
|
$pageElements['CPASSWORD_ERROR'] = 'TRUE';
|
||||||
|
}else{
|
||||||
|
$pageElements['CPASSWORD_ERROR'] = 'FALSE';
|
||||||
|
}
|
||||||
|
if ( $email != "success" ){
|
||||||
|
$pageElements['EMAIL_ERROR'] = 'TRUE';
|
||||||
|
}else{
|
||||||
|
$pageElements['EMAIL_ERROR'] = 'FALSE';
|
||||||
|
}
|
||||||
|
if ( isset( $_POST["TaC"] ) ){
|
||||||
|
$pageElements['TAC_ERROR'] = 'FALSE';
|
||||||
|
}else{
|
||||||
|
$pageElements['TAC_ERROR'] = 'TRUE';
|
||||||
|
}
|
||||||
|
helpers :: loadtemplate( 'register', $pageElements );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
function write_user(){
|
||||||
|
|
||||||
|
|
||||||
// add user locally here
|
// add user locally here
|
||||||
$return = users :: add_user();
|
users :: add_user();
|
||||||
return $return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function checkUser(){
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
Loading…
Reference in a new issue