xinyin025/TravianZ
1
0
Fork 0
mirror of https://github.com/Shadowss/TravianZ.git synced 2026-07-06 21:04:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Trying to fix this monstrosity #1

Browse Source
This commit is contained in:
Domen Kajdič
2016-09-13 15:38:14 +02:00
parent 0e4b22d99f
commit 2cf2f3c343
22 changed files with 969 additions and 4733 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Session.php
+20 -17
View File
@@ -60,7 +60,7 @@ class Session {
private $userarray = array();
var $villages = array();
function Session() {
function __construct() {
global $database; //TienTN fix
$this->time = time();
@@ -88,25 +88,25 @@ class Session {
$_SESSION['checker'] = $generator->generateRandStr(3);
$_SESSION['mchecker'] = $generator->generateRandStr(5);
$_SESSION['qst'] = $database->getUserField($_SESSION['username'], "quest", 1);
$result = mysql_query("SELECT village_select FROM `". TB_PREFIX."users` WHERE `username`='".$_SESSION['username']."'");
$dbarray = mysql_fetch_assoc($result);
$result = mysqli_query($link,"SELECT village_select FROM `". TB_PREFIX."users` WHERE `username`='".$_SESSION['username']."'");
$dbarray = mysqli_fetch_assoc($result);
$selected_village=$dbarray['village_select'];
if(!isset($_SESSION['wid'])) {
if($selected_village!='') {
$query = mysql_query('SELECT * FROM `' . TB_PREFIX . 'vdata` WHERE `wref` = '.$selected_village);
$query = mysqli_query($link,'SELECT * FROM `' . TB_PREFIX . 'vdata` WHERE `wref` = '.$selected_village);
}else{
$query = mysql_query('SELECT * FROM `' . TB_PREFIX . 'vdata` WHERE `owner` = ' . $database->getUserField($_SESSION['username'], "id", 1) . ' LIMIT 1');
$query = mysqli_query($link,'SELECT * FROM `' . TB_PREFIX . 'vdata` WHERE `owner` = ' . $database->getUserField($_SESSION['username'], "id", 1) . ' LIMIT 1');
}
$data = mysql_fetch_assoc($query);
$data = mysqli_fetch_assoc($query);
$_SESSION['wid'] = $data['wref'];
} else
if($_SESSION['wid'] == '') {
if($selected_village!='') {
$query = mysql_query('SELECT * FROM `' . TB_PREFIX . 'vdata` WHERE `wref` = '.$selected_village);
$query = mysqli_query($link,'SELECT * FROM `' . TB_PREFIX . 'vdata` WHERE `wref` = '.$selected_village);
}else{
$query = mysql_query('SELECT * FROM `' . TB_PREFIX . 'vdata` WHERE `owner` = ' . $database->getUserField($_SESSION['username'], "id", 1) . ' LIMIT 1');
$query = mysqli_query($link,'SELECT * FROM `' . TB_PREFIX . 'vdata` WHERE `owner` = ' . $database->getUserField($_SESSION['username'], "id", 1) . ' LIMIT 1');
}
$data = mysql_fetch_assoc($query);
$data = mysqli_fetch_assoc($query);
$_SESSION['wid'] = $data['wref'];
}
$this->PopulateVar();
@@ -157,20 +157,23 @@ class Session {
***************************/
function CheckHeroReal () {
global $database;
global $database,$link;
$hero=0;
foreach($this->villages as $myvill){
$q1 = "SELECT SUM(hero) from " . TB_PREFIX . "enforcement where `from` = ".$myvill; // check if hero is send as reinforcement
$result1 = mysql_query($q1, $database->connection);
$he1=mysql_fetch_array($result1);
$hero+=$he1[0];
$result1 = mysqli_query($link,$q1);
if(mysqli_num_rows($result1) != 0) {
$he1=mysqli_fetch_array($result1);
$hero+=$he1[0];
}
$q2 = "SELECT SUM(hero) from " . TB_PREFIX . "units where `vref` = ".$myvill; // check if hero is on my account (all villages)
$result2 = mysql_query($q2, $database->connection);
$he2=mysql_fetch_array($result2);
$result2 = mysqli_query($link,$q2);
$he2=mysqli_fetch_array($result2);
$hero+=$he2[0];
$q3 = "SELECT SUM(t11) from " . TB_PREFIX . "prisoners where `from` = ".$myvill; // check if hero is prisoner
$result3 = mysql_query($q3, $database->connection);
$he3=mysql_fetch_array($result3);
$result3 = mysqli_query($link,$q3);
$he3=mysqli_fetch_array($result3);
$hero+=$he3[0];
$hero+=$database->HeroNotInVil($myvill); // check if hero is not in village (come back from attack , raid , etc.)
}