Merge branch 'evader1337-master'

iopietro · Aug 28, 2017 · 83429ed · 83429ed
2 parents 1a4005c + 9261a4a
commit 83429ed
Show file tree

Hide file tree

Showing 93 changed files with 5,048 additions and 9,214 deletions.
diff --git a/Admin/admin.php b/Admin/admin.php
@@ -18,6 +18,7 @@
 #################################################################################
 
 session_start();
+include_once("../GameEngine/config.php");
 include_once("../GameEngine/Database.php");
 include_once ("../GameEngine/Lang/" . LANG . ".php");
 include_once("../GameEngine/Admin/database.php");

diff --git a/GameEngine/Account.php b/GameEngine/Account.php
@@ -20,7 +20,7 @@
 
 class Account {
 
-	function Account() {
+	function __construct() {
 		global $session;
 		if(isset($_POST['ft'])) {
 			switch($_POST['ft']) {
@@ -140,8 +140,8 @@ 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);
+			$result = mysqli_query($GLOBALS['link'],$q);
+			$dbarray = mysqli_fetch_array($result);
 			if($dbarray['act'] == $_POST['id']) {
 				$uid = $database->register($dbarray['username'],$dbarray['password'],$dbarray['email'],$dbarray['tribe'],"");
 				if($uid) {
@@ -165,8 +165,8 @@ private function Activate() {
 	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);
+		$result = mysqli_query($GLOBALS['link'],$q);
+		$dbarray = mysqli_fetch_array($result);
 		if(md5($_POST['pw']) == $dbarray['password']) {
 			$database->unreg($dbarray['username']);
 			header("Location: anmelden.php");
@@ -178,9 +178,10 @@ private function Unreg() {
 
 	private function Login() {
 		global $database,$session,$form;
-		$_POST['user'] = mysql_real_escape_string($_POST['user']);
+		$user = $_POST['user'];
+		$user = mysqli_real_escape_string($GLOBALS['link'], $user);
 		if(!isset($_POST['user']) || $_POST['user'] == "") {
-			$form->addError("user",LOGIN_USR_EMPTY);
+			$form->addError("user",$user);
 		}
 		else if(!$database->checkExist($_POST['user'],0)) {
 			$form->addError("user",USR_NT_FOUND);
@@ -224,7 +225,7 @@ private function Logout() {
 		global $session,$database;
 		unset($_SESSION['wid']);
 		$database->activeModify(addslashes($session->username),1);
-		$database->UpdateOnline("logout") or die(mysql_error());
+		$database->UpdateOnline("logout") or die(mysqli_error());
 		$session->Logout();
 	}