mirror of
https://github.com/Shadowss/TravianZ.git
synced 2026-07-11 23:26:08 +00:00
update install and email activation + add friends inviting system
This commit is contained in:
unknown
+232
-223
@@ -1,226 +1,235 @@
|
||||
<?php
|
||||
#################################################################################
|
||||
## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ##
|
||||
## --------------------------------------------------------------------------- ##
|
||||
## Filename Account.php ##
|
||||
## Developed by: Dzoki ##
|
||||
## License: TravianX Project ##
|
||||
## Copyright: TravianX (c) 2010-2011. All rights reserved. ##
|
||||
## ##
|
||||
#################################################################################
|
||||
<?php
|
||||
#################################################################################
|
||||
## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ##
|
||||
## --------------------------------------------------------------------------- ##
|
||||
## Filename Account.php ##
|
||||
## Developed by: Dzoki ##
|
||||
## License: TravianX Project ##
|
||||
## Copyright: TravianX (c) 2010-2011. All rights reserved. ##
|
||||
## ##
|
||||
#################################################################################
|
||||
|
||||
include("Session.php");
|
||||
include("Session.php");
|
||||
|
||||
class Account {
|
||||
|
||||
function Account() {
|
||||
global $session;
|
||||
if(isset($_POST['ft'])) {
|
||||
switch($_POST['ft']) {
|
||||
case "a1":
|
||||
$this->Signup();
|
||||
break;
|
||||
case "a2":
|
||||
$this->Activate();
|
||||
break;
|
||||
case "a3":
|
||||
$this->Unreg();
|
||||
break;
|
||||
case "a4":
|
||||
$this->Login();
|
||||
break;
|
||||
}
|
||||
} if(isset($_GET['code'])) {
|
||||
$_POST['id'] = $_GET['code']; $this->Activate();
|
||||
}
|
||||
else {
|
||||
if($session->logged_in && in_array("logout.php",explode("/",$_SERVER['PHP_SELF']))) {
|
||||
$this->Logout();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private function Signup() {
|
||||
global $database,$form,$mailer,$generator,$session;
|
||||
if(!isset($_POST['name']) || $_POST['name'] == "") {
|
||||
$form->addError("name",USRNM_EMPTY);
|
||||
}
|
||||
else {
|
||||
if(strlen($_POST['name']) < USRNM_MIN_LENGTH) {
|
||||
$form->addError("name",USRNM_SHORT);
|
||||
}
|
||||
else if(!USRNM_SPECIAL && preg_match('/[^0-9A-Za-z]/',$_POST['name'])) {
|
||||
$form->addError("name",USRNM_CHAR);
|
||||
}
|
||||
else if($database->checkExist($_POST['name'],0)) {
|
||||
$form->addError("name",USRNM_TAKEN);
|
||||
}
|
||||
else if($database->checkExist_activate($_POST['name'],0)) {
|
||||
$form->addError("name",USRNM_TAKEN);
|
||||
}
|
||||
|
||||
}
|
||||
if(!isset($_POST['pw']) || $_POST['pw'] == "") {
|
||||
$form->addError("pw",PW_EMPTY);
|
||||
}
|
||||
else {
|
||||
if(strlen($_POST['pw']) < PW_MIN_LENGTH) {
|
||||
$form->addError("pw",PW_SHORT);
|
||||
}
|
||||
else if($_POST['pw'] == $_POST['name']) {
|
||||
$form->addError("pw",PW_INSECURE);
|
||||
}
|
||||
}
|
||||
if(!isset($_POST['email'])) {
|
||||
$form->addError("email",EMAIL_EMPTY);
|
||||
}
|
||||
else {
|
||||
if(!$this->validEmail($_POST['email'])) {
|
||||
$form->addError("email",EMAIL_INVALID);
|
||||
}
|
||||
else if($database->checkExist($_POST['email'],1)) {
|
||||
$form->addError("email",EMAIL_TAKEN);
|
||||
}
|
||||
else if($database->checkExist_activate($_POST['email'],1)) {
|
||||
$form->addError("email",EMAIL_TAKEN);
|
||||
}
|
||||
}
|
||||
if(!isset($_POST['vid'])) {
|
||||
$form->addError("tribe",TRIBE_EMPTY);
|
||||
}
|
||||
if(!isset($_POST['agb'])) {
|
||||
$form->addError("agree",AGREE_ERROR);
|
||||
}
|
||||
if($form->returnErrors() > 0) {
|
||||
$_SESSION['errorarray'] = $form->getErrors();
|
||||
$_SESSION['valuearray'] = $_POST;
|
||||
|
||||
header("Location: anmelden.php");
|
||||
}
|
||||
else {
|
||||
if(AUTH_EMAIL){
|
||||
$act = $generator->generateRandStr(10);
|
||||
$act2 = $generator->generateRandStr(5);
|
||||
$uid = $database->activate($_POST['name'],md5($_POST['pw']),$_POST['email'],$_POST['vid'],$_POST['kid'],$act,$act2);
|
||||
if($uid) {
|
||||
|
||||
$mailer->sendActivate($_POST['email'],$_POST['name'],$_POST['pw'],$act);
|
||||
header("Location: activate.php?id=$uid&q=$act2");
|
||||
}
|
||||
}
|
||||
else {
|
||||
$uid = $database->register($_POST['name'],md5($_POST['pw']),$_POST['email'],$_POST['vid'],$_POST['kid'],$act);
|
||||
if($uid) {
|
||||
setcookie("COOKUSR",$_POST['name'],time()+COOKIE_EXPIRE,COOKIE_PATH);
|
||||
setcookie("COOKEMAIL",$_POST['email'],time()+COOKIE_EXPIRE,COOKIE_PATH);
|
||||
|
||||
$database->updateUserField($uid,"act","",1);
|
||||
$this->generateBase($_POST['kid'],$uid,$_POST['name']);
|
||||
header("Location: login.php");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private function Activate() {
|
||||
global $database;
|
||||
$q = "SELECT * FROM ".TB_PREFIX."activate where act = '".$_POST['id']."'";
|
||||
$result = mysql_query($q, $database->connection);
|
||||
$dbarray = mysql_fetch_array($result);
|
||||
if($dbarray['act'] == $_POST['id']) {
|
||||
$uid = $database->register($dbarray['username'],$dbarray['password'],$dbarray['email'],$dbarray['tribe'],$dbarray['location'],"");
|
||||
if($uid) {
|
||||
$database->unreg($dbarray['username']);
|
||||
$this->generateBase($dbarray['kid'],$uid,$dbarray['username']);
|
||||
header("Location: activate.php?e=2");
|
||||
}
|
||||
}
|
||||
else {
|
||||
header("Location: activate.php?e=3");
|
||||
}
|
||||
}
|
||||
|
||||
private function Unreg() {
|
||||
global $database;
|
||||
$q = "SELECT * FROM ".TB_PREFIX."activate where id = '".$_POST['id']."'";
|
||||
$result = mysql_query($q, $database->connection);
|
||||
$dbarray = mysql_fetch_array($result);
|
||||
if(md5($_POST['pw']) == $dbarray['password']) {
|
||||
$database->unreg($dbarray['username']);
|
||||
header("Location: anmelden.php");
|
||||
}
|
||||
else {
|
||||
header("Location: activate.php?e=3");
|
||||
}
|
||||
}
|
||||
|
||||
private function Login() {
|
||||
global $database,$session,$form;
|
||||
if(!isset($_POST['user']) || $_POST['user'] == "") {
|
||||
$form->addError("user",LOGIN_USR_EMPTY);
|
||||
}
|
||||
else if(!$database->checkExist($_POST['user'],0)) {
|
||||
$form->addError("user",USR_NT_FOUND);
|
||||
}
|
||||
if(!isset($_POST['pw']) || $_POST['pw'] == "") {
|
||||
$form->addError("pw",LOGIN_PASS_EMPTY);
|
||||
}
|
||||
else if(!$database->login($_POST['user'],$_POST['pw']) && !$database->sitterLogin($_POST['user'],$_POST['pw'])) {
|
||||
$form->addError("pw",LOGIN_PW_ERROR);
|
||||
}
|
||||
if($database->getUserField($_POST['user'],"act",1) != "") {
|
||||
$form->addError("activate",$_POST['user']);
|
||||
}
|
||||
if($form->returnErrors() > 0) {
|
||||
$_SESSION['errorarray'] = $form->getErrors();
|
||||
$_SESSION['valuearray'] = $_POST;
|
||||
|
||||
header("Location: login.php");
|
||||
}
|
||||
else {
|
||||
setcookie("COOKUSR",$_POST['user'],time()+COOKIE_EXPIRE,COOKIE_PATH);
|
||||
$database->UpdateOnline("login" ,$_POST['user'],time());
|
||||
$session->login($_POST['user']);
|
||||
}
|
||||
}
|
||||
|
||||
private function Logout() {
|
||||
global $session,$database;
|
||||
unset($_SESSION['wid']);
|
||||
$database->activeModify($session->username,1);
|
||||
$database->UpdateOnline("logout") or die(mysql_error());
|
||||
$session->Logout();
|
||||
}
|
||||
|
||||
private function validEmail($email) {
|
||||
$regexp="/^[a-z0-9]+([_\\.-][a-z0-9]+)*@([a-z0-9]+([\.-][a-z0-9]+)*)+\\.[a-z]{2,}$/i";
|
||||
if ( !preg_match($regexp, $email) ) {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
function generateBase($kid,$uid,$username) {
|
||||
global $database,$message;
|
||||
$database->updateUserField($uid,"location","",1);
|
||||
if($kid == 0) {
|
||||
$kid = rand(1,4);
|
||||
}
|
||||
else{
|
||||
$kid = $_POST['kid'];
|
||||
}
|
||||
|
||||
$wid = $database->generateBase($kid);
|
||||
$database->setFieldTaken($wid);
|
||||
$database->addVillage($wid,$uid,$username,1);
|
||||
$database->addResourceFields($wid,$database->getVillageType($wid));
|
||||
$database->addUnits($wid);
|
||||
$database->addTech($wid);
|
||||
$database->addABTech($wid);
|
||||
$database->updateUserField($uid,"access",USER,1);
|
||||
$message->sendWelcome($uid,$username);
|
||||
}
|
||||
|
||||
};
|
||||
$account = new Account;
|
||||
class Account {
|
||||
|
||||
function Account() {
|
||||
global $session;
|
||||
if(isset($_POST['ft'])) {
|
||||
switch($_POST['ft']) {
|
||||
case "a1":
|
||||
$this->Signup();
|
||||
break;
|
||||
case "a2":
|
||||
$this->Activate();
|
||||
break;
|
||||
case "a3":
|
||||
$this->Unreg();
|
||||
break;
|
||||
case "a4":
|
||||
$this->Login();
|
||||
break;
|
||||
}
|
||||
} if(isset($_GET['code'])) {
|
||||
$_POST['id'] = $_GET['code']; $this->Activate();
|
||||
}
|
||||
else {
|
||||
if($session->logged_in && in_array("logout.php",explode("/",$_SERVER['PHP_SELF']))) {
|
||||
$this->Logout();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private function Signup() {
|
||||
global $database,$form,$mailer,$generator,$session;
|
||||
if(!isset($_POST['name']) || $_POST['name'] == "") {
|
||||
$form->addError("name",USRNM_EMPTY);
|
||||
}
|
||||
else {
|
||||
if(strlen($_POST['name']) < USRNM_MIN_LENGTH) {
|
||||
$form->addError("name",USRNM_SHORT);
|
||||
}
|
||||
else if(!USRNM_SPECIAL && preg_match('/[^0-9A-Za-z]/',$_POST['name'])) {
|
||||
$form->addError("name",USRNM_CHAR);
|
||||
}
|
||||
else if($database->checkExist($_POST['name'],0)) {
|
||||
$form->addError("name",USRNM_TAKEN);
|
||||
}
|
||||
else if($database->checkExist_activate($_POST['name'],0)) {
|
||||
$form->addError("name",USRNM_TAKEN);
|
||||
}
|
||||
|
||||
}
|
||||
if(!isset($_POST['pw']) || $_POST['pw'] == "") {
|
||||
$form->addError("pw",PW_EMPTY);
|
||||
}
|
||||
else {
|
||||
if(strlen($_POST['pw']) < PW_MIN_LENGTH) {
|
||||
$form->addError("pw",PW_SHORT);
|
||||
}
|
||||
else if($_POST['pw'] == $_POST['name']) {
|
||||
$form->addError("pw",PW_INSECURE);
|
||||
}
|
||||
}
|
||||
if(!isset($_POST['email'])) {
|
||||
$form->addError("email",EMAIL_EMPTY);
|
||||
}
|
||||
else {
|
||||
if(!$this->validEmail($_POST['email'])) {
|
||||
$form->addError("email",EMAIL_INVALID);
|
||||
}
|
||||
else if($database->checkExist($_POST['email'],1)) {
|
||||
$form->addError("email",EMAIL_TAKEN);
|
||||
}
|
||||
else if($database->checkExist_activate($_POST['email'],1)) {
|
||||
$form->addError("email",EMAIL_TAKEN);
|
||||
}
|
||||
}
|
||||
if(!isset($_POST['vid'])) {
|
||||
$form->addError("tribe",TRIBE_EMPTY);
|
||||
}
|
||||
if(!isset($_POST['agb'])) {
|
||||
$form->addError("agree",AGREE_ERROR);
|
||||
}
|
||||
if($form->returnErrors() > 0) {
|
||||
$_SESSION['errorarray'] = $form->getErrors();
|
||||
$_SESSION['valuearray'] = $_POST;
|
||||
|
||||
header("Location: anmelden.php");
|
||||
}
|
||||
else {
|
||||
if(AUTH_EMAIL){
|
||||
$act = $generator->generateRandStr(10);
|
||||
$act2 = $generator->generateRandStr(5);
|
||||
$uid = $database->activate($_POST['name'],md5($_POST['pw']),$_POST['email'],$_POST['vid'],$_POST['kid'],$act,$act2);
|
||||
if($uid) {
|
||||
|
||||
$mailer->sendActivate($_POST['email'],$_POST['name'],$_POST['pw'],$act);
|
||||
header("Location: activate.php?id=$uid&q=$act2");
|
||||
}
|
||||
}
|
||||
else {
|
||||
$uid = $database->register($_POST['name'],md5($_POST['pw']),$_POST['email'],$_POST['vid'],$_POST['kid'],$act);
|
||||
if($uid) {
|
||||
setcookie("COOKUSR",$_POST['name'],time()+COOKIE_EXPIRE,COOKIE_PATH);
|
||||
setcookie("COOKEMAIL",$_POST['email'],time()+COOKIE_EXPIRE,COOKIE_PATH);
|
||||
|
||||
$database->updateUserField($uid,"act","",1);
|
||||
$database->updateUserField($uid,"invited",$_POST['invited'],1);
|
||||
$this->generateBase($_POST['kid'],$uid,$_POST['name']);
|
||||
header("Location: login.php");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private function Activate() {
|
||||
if(START_DATE < date('m/d/Y') or START_DATE == date('m/d/Y') && START_TIME <= date('H:i'))
|
||||
{
|
||||
global $database;
|
||||
$q = "SELECT * FROM ".TB_PREFIX."activate where act = '".$_POST['id']."'";
|
||||
$result = mysql_query($q, $database->connection);
|
||||
$dbarray = mysql_fetch_array($result);
|
||||
if($dbarray['act'] == $_POST['id']) {
|
||||
$uid = $database->register($dbarray['username'],$dbarray['password'],$dbarray['email'],$dbarray['tribe'],$dbarray['location'],"");
|
||||
if($uid) {
|
||||
$database->unreg($dbarray['username']);
|
||||
$this->generateBase($dbarray['kid'],$uid,$dbarray['username']);
|
||||
header("Location: activate.php?e=2");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
header("Location: activate.php?e=3");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
header("Location: activate.php");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private function Unreg() {
|
||||
global $database;
|
||||
$q = "SELECT * FROM ".TB_PREFIX."activate where id = '".$_POST['id']."'";
|
||||
$result = mysql_query($q, $database->connection);
|
||||
$dbarray = mysql_fetch_array($result);
|
||||
if(md5($_POST['pw']) == $dbarray['password']) {
|
||||
$database->unreg($dbarray['username']);
|
||||
header("Location: anmelden.php");
|
||||
}
|
||||
else {
|
||||
header("Location: activate.php?e=3");
|
||||
}
|
||||
}
|
||||
|
||||
private function Login() {
|
||||
global $database,$session,$form;
|
||||
if(!isset($_POST['user']) || $_POST['user'] == "") {
|
||||
$form->addError("user",LOGIN_USR_EMPTY);
|
||||
}
|
||||
else if(!$database->checkExist($_POST['user'],0)) {
|
||||
$form->addError("user",USR_NT_FOUND);
|
||||
}
|
||||
if(!isset($_POST['pw']) || $_POST['pw'] == "") {
|
||||
$form->addError("pw",LOGIN_PASS_EMPTY);
|
||||
}
|
||||
else if(!$database->login($_POST['user'],$_POST['pw']) && !$database->sitterLogin($_POST['user'],$_POST['pw'])) {
|
||||
$form->addError("pw",LOGIN_PW_ERROR);
|
||||
}
|
||||
if($database->getUserField($_POST['user'],"act",1) != "") {
|
||||
$form->addError("activate",$_POST['user']);
|
||||
}
|
||||
if($form->returnErrors() > 0) {
|
||||
$_SESSION['errorarray'] = $form->getErrors();
|
||||
$_SESSION['valuearray'] = $_POST;
|
||||
|
||||
header("Location: login.php");
|
||||
}
|
||||
else {
|
||||
setcookie("COOKUSR",$_POST['user'],time()+COOKIE_EXPIRE,COOKIE_PATH);
|
||||
$database->UpdateOnline("login" ,$_POST['user'],time());
|
||||
$session->login($_POST['user']);
|
||||
}
|
||||
}
|
||||
|
||||
private function Logout() {
|
||||
global $session,$database;
|
||||
unset($_SESSION['wid']);
|
||||
$database->activeModify($session->username,1);
|
||||
$database->UpdateOnline("logout") or die(mysql_error());
|
||||
$session->Logout();
|
||||
}
|
||||
|
||||
private function validEmail($email) {
|
||||
$regexp="/^[a-z0-9]+([_\\.-][a-z0-9]+)*@([a-z0-9]+([\.-][a-z0-9]+)*)+\\.[a-z]{2,}$/i";
|
||||
if ( !preg_match($regexp, $email) ) {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
function generateBase($kid,$uid,$username) {
|
||||
global $database,$message;
|
||||
if($kid == 0) {
|
||||
$kid = rand(1,4);
|
||||
}
|
||||
else{
|
||||
$kid = $_POST['kid'];
|
||||
}
|
||||
|
||||
$wid = $database->generateBase($kid);
|
||||
$database->setFieldTaken($wid);
|
||||
$database->addVillage($wid,$uid,$username,1);
|
||||
$database->addResourceFields($wid,$database->getVillageType($wid));
|
||||
$database->addUnits($wid);
|
||||
$database->addTech($wid);
|
||||
$database->addABTech($wid);
|
||||
$database->updateUserField($uid,"access",USER,1);
|
||||
$message->sendWelcome($uid,$username);
|
||||
}
|
||||
|
||||
};
|
||||
$account = new Account;
|
||||
?>
|
||||
@@ -168,6 +168,7 @@ class Automation {
|
||||
$this->sendSettlersComplete();
|
||||
}
|
||||
$this->updateGeneralAttack();
|
||||
$this->checkInvitedPlayes();
|
||||
$this->updateStore();
|
||||
}
|
||||
|
||||
@@ -1912,8 +1913,8 @@ if($data['t11'] > 0){
|
||||
$walllevel =0;
|
||||
$rplevel =0;
|
||||
}
|
||||
$palaceimg = "<img src=\"gpack/travian_default/img/g/g26.gif\" height=\"30\" width=\"24\" alt=\"Palace\" title=\"Palace\" />";
|
||||
$crannyimg = "<img src=\"gpack/travian_default/img/g/g23.gif\" height=\"30\" width=\"24\" alt=\"Cranny\" title=\"Cranny\" />";
|
||||
$palaceimg = "<img src=\"<?php echo GP_LOCATE; ?>img/g/g26.gif\" height=\"30\" width=\"24\" alt=\"Palace\" title=\"Palace\" />";
|
||||
$crannyimg = "<img src=\"<?php echo GP_LOCATE; ?>img/g/g23.gif\" height=\"30\" width=\"24\" alt=\"Cranny\" title=\"Cranny\" />";
|
||||
$info_spy = "".$spy_pic.",".$palaceimg." Residance/Palace Level : ".$rplevel."
|
||||
<br>".$crannyimg." Cranny level: ".$crannylevel."<br><br>Wall Level : ".$walllevel."";
|
||||
|
||||
@@ -2731,7 +2732,7 @@ $crannyimg = "<img src=\"gpack/travian_default/img/g/g23.gif\" height=\"30\" wid
|
||||
}
|
||||
}
|
||||
|
||||
private function demolitionComplete() {
|
||||
private function demolitionComplete() {
|
||||
global $building,$database;
|
||||
$ourFileHandle = @fopen("GameEngine/Prevention/demolition.txt", 'w');
|
||||
@fclose($ourFileHandle);
|
||||
@@ -2858,6 +2859,21 @@ private function demolitionComplete() {
|
||||
}
|
||||
}
|
||||
|
||||
private function checkInvitedPlayes() {
|
||||
global $database;
|
||||
$q = "SELECT * FROM ".TB_PREFIX."users WHERE invited != 0";
|
||||
$array = $database->query_return($q);
|
||||
foreach($array as $user) {
|
||||
$varray = count($database->getProfileVillages($user['id']));
|
||||
if($varray > 1){
|
||||
$usergold = $database->getUserField($user['invited'],"gold",0);
|
||||
$gold = $usergold+50;
|
||||
$database->updateUserField($user['invited'],"gold",$gold,1);
|
||||
$database->updateUserField($user['id'],"invited",0,1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private function updateGeneralAttack() {
|
||||
global $database;
|
||||
$time = time();
|
||||
|
||||
@@ -138,6 +138,12 @@
|
||||
$dbarray = mysql_fetch_array($result);
|
||||
return $dbarray[$field];
|
||||
}
|
||||
|
||||
function getInvitedUser($uid) {
|
||||
$q = "SELECT * FROM " . TB_PREFIX . "users where invited = $uid order by regtime desc";
|
||||
$result = mysql_query($q, $this->connection);
|
||||
return $this->mysql_fetch_all($result);
|
||||
}
|
||||
|
||||
function getVrefField($ref, $field){
|
||||
$q = "SELECT $field FROM " . TB_PREFIX . "vdata where wref = '$ref'";
|
||||
|
||||
+22
-2
@@ -33,8 +33,28 @@ Greetings,
|
||||
TravianX";
|
||||
|
||||
$headers = "From: Mailer@".SERVER_NAME."\n";
|
||||
//$headers .= 'MIME-Version: 1.0' . "\r\n";
|
||||
//$headers .= 'Content-type: text/html; charset=iso-8859-1' . "\r\n";
|
||||
|
||||
mail($email, $subject, $message, $headers);
|
||||
}
|
||||
|
||||
function sendInvite($email,$uid,$text) {
|
||||
|
||||
$subject = "".SERVER_NAME." registeration";
|
||||
|
||||
$message = "Hello ".$username."
|
||||
|
||||
Try the new ".SERVER_NAME."!
|
||||
|
||||
|
||||
Link: ".SERVER."anmelden.php?id=".$uid."
|
||||
|
||||
".$text."
|
||||
|
||||
|
||||
Greetings,
|
||||
TravianX";
|
||||
|
||||
$headers = "From: Mailer@".SERVER_NAME."\n";
|
||||
|
||||
mail($email, $subject, $message, $headers);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user