mirror of
https://github.com/Shadowss/TravianZ.git
synced 2026-06-28 00:24:23 +00:00
Trying to fix this monstrosity #1
This commit is contained in:
Domen Kajdič
+90
-91
@@ -19,25 +19,24 @@
|
||||
}
|
||||
|
||||
public function getUserRank($id) {
|
||||
$ranking = $this->getRank();
|
||||
$users = "SELECT * FROM " . TB_PREFIX . "users WHERE access < " . (INCLUDE_ADMIN ? "10" : "8") . "";
|
||||
$users2 = mysql_num_rows(mysql_query($users));
|
||||
$users3 = $users2+1;
|
||||
if(count($ranking) > 0) {
|
||||
for($i=0;$i<($users3);$i++) {
|
||||
if( isset( $ranking[$i]['userid'] ) )
|
||||
{
|
||||
if($ranking[$i]['userid'] == $id && $ranking[$i] != "pad") {
|
||||
$myrank = $i;
|
||||
$ranking = $this->getRank();
|
||||
$users = "SELECT * FROM " . TB_PREFIX . "users WHERE access < " . (INCLUDE_ADMIN ? "10" : "8") . "";
|
||||
$users2 = mysqli_num_rows(mysqli_query($GLOBALS['link'],$users));
|
||||
$users3 = $users2+1;
|
||||
if(count($ranking) > 0) {
|
||||
for($i=0;$i<($users3);$i++) {
|
||||
if( isset( $ranking[$i]['userid'] ) ) {
|
||||
if($ranking[$i]['userid'] == $id && $ranking[$i] != "pad") {
|
||||
$myrank = $i;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return $myrank;
|
||||
}
|
||||
|
||||
public function procRankReq($get) {
|
||||
global $village, $session, $database;
|
||||
global $village, $session;
|
||||
if(isset($get['id'])) {
|
||||
switch($get['id']) {
|
||||
case 1:
|
||||
@@ -219,55 +218,55 @@
|
||||
}
|
||||
|
||||
public function procRankArray() {
|
||||
global $database, $multisort;
|
||||
if($database->countUser() > 0){
|
||||
$holder = array();
|
||||
if(SHOW_NATARS == True){
|
||||
$q = "SELECT " . TB_PREFIX . "users.id userid, " . TB_PREFIX . "users.username username, " . TB_PREFIX . "users.oldrank oldrank, " . TB_PREFIX . "users.alliance alliance, (
|
||||
global $multisort;
|
||||
if($GLOBALS['db']->countUser() > 0){
|
||||
$holder = array();
|
||||
if(SHOW_NATARS == True){
|
||||
$q = "SELECT " . TB_PREFIX . "users.id userid, " . TB_PREFIX . "users.username username, " . TB_PREFIX . "users.oldrank oldrank, " . TB_PREFIX . "users.alliance alliance, (
|
||||
|
||||
SELECT SUM( " . TB_PREFIX . "vdata.pop )
|
||||
FROM " . TB_PREFIX . "vdata
|
||||
WHERE " . TB_PREFIX . "vdata.owner = userid
|
||||
)totalpop, (
|
||||
SELECT SUM( " . TB_PREFIX . "vdata.pop )
|
||||
FROM " . TB_PREFIX . "vdata
|
||||
WHERE " . TB_PREFIX . "vdata.owner = userid
|
||||
)totalpop, (
|
||||
|
||||
SELECT COUNT( " . TB_PREFIX . "vdata.wref )
|
||||
FROM " . TB_PREFIX . "vdata
|
||||
WHERE " . TB_PREFIX . "vdata.owner = userid AND type != 99
|
||||
)totalvillages, (
|
||||
SELECT COUNT( " . TB_PREFIX . "vdata.wref )
|
||||
FROM " . TB_PREFIX . "vdata
|
||||
WHERE " . TB_PREFIX . "vdata.owner = userid AND type != 99
|
||||
)totalvillages, (
|
||||
|
||||
SELECT " . TB_PREFIX . "alidata.tag
|
||||
FROM " . TB_PREFIX . "alidata, " . TB_PREFIX . "users
|
||||
WHERE " . TB_PREFIX . "alidata.id = " . TB_PREFIX . "users.alliance
|
||||
AND " . TB_PREFIX . "users.id = userid
|
||||
)allitag
|
||||
FROM " . TB_PREFIX . "users
|
||||
WHERE " . TB_PREFIX . "users.access < " . (INCLUDE_ADMIN ? "10" : "8") . "
|
||||
AND " . TB_PREFIX . "users.tribe <= 5 ORDER BY totalpop DESC, totalvillages DESC, userid DESC";
|
||||
}else{
|
||||
$q = "SELECT " . TB_PREFIX . "users.id userid, " . TB_PREFIX . "users.username username, " . TB_PREFIX . "users.oldrank oldrank, " . TB_PREFIX . "users.alliance alliance, (
|
||||
SELECT " . TB_PREFIX . "alidata.tag
|
||||
FROM " . TB_PREFIX . "alidata, " . TB_PREFIX . "users
|
||||
WHERE " . TB_PREFIX . "alidata.id = " . TB_PREFIX . "users.alliance
|
||||
AND " . TB_PREFIX . "users.id = userid
|
||||
)allitag
|
||||
FROM " . TB_PREFIX . "users
|
||||
WHERE " . TB_PREFIX . "users.access < " . (INCLUDE_ADMIN ? "10" : "8") . "
|
||||
AND " . TB_PREFIX . "users.tribe <= 5 ORDER BY totalpop DESC, totalvillages DESC, userid DESC";
|
||||
} else {
|
||||
$q = "SELECT " . TB_PREFIX . "users.id userid, " . TB_PREFIX . "users.username username, " . TB_PREFIX . "users.oldrank oldrank, " . TB_PREFIX . "users.alliance alliance, (
|
||||
|
||||
SELECT SUM( " . TB_PREFIX . "vdata.pop )
|
||||
FROM " . TB_PREFIX . "vdata
|
||||
WHERE " . TB_PREFIX . "vdata.owner = userid
|
||||
)totalpop, (
|
||||
SELECT SUM( " . TB_PREFIX . "vdata.pop )
|
||||
FROM " . TB_PREFIX . "vdata
|
||||
WHERE " . TB_PREFIX . "vdata.owner = userid
|
||||
)totalpop, (
|
||||
|
||||
SELECT COUNT( " . TB_PREFIX . "vdata.wref )
|
||||
FROM " . TB_PREFIX . "vdata
|
||||
WHERE " . TB_PREFIX . "vdata.owner = userid AND type != 99
|
||||
)totalvillages, (
|
||||
SELECT COUNT( " . TB_PREFIX . "vdata.wref )
|
||||
FROM " . TB_PREFIX . "vdata
|
||||
WHERE " . TB_PREFIX . "vdata.owner = userid AND type != 99
|
||||
)totalvillages, (
|
||||
|
||||
SELECT " . TB_PREFIX . "alidata.tag
|
||||
FROM " . TB_PREFIX . "alidata, " . TB_PREFIX . "users
|
||||
WHERE " . TB_PREFIX . "alidata.id = " . TB_PREFIX . "users.alliance
|
||||
AND " . TB_PREFIX . "users.id = userid
|
||||
)allitag
|
||||
FROM " . TB_PREFIX . "users
|
||||
WHERE " . TB_PREFIX . "users.access < " . (INCLUDE_ADMIN ? "10" : "8") . "
|
||||
AND " . TB_PREFIX . "users.tribe <= 3 ORDER BY totalpop DESC, totalvillages DESC, userid DESC";
|
||||
}
|
||||
SELECT " . TB_PREFIX . "alidata.tag
|
||||
FROM " . TB_PREFIX . "alidata, " . TB_PREFIX . "users
|
||||
WHERE " . TB_PREFIX . "alidata.id = " . TB_PREFIX . "users.alliance
|
||||
AND " . TB_PREFIX . "users.id = userid
|
||||
)allitag
|
||||
FROM " . TB_PREFIX . "users
|
||||
WHERE " . TB_PREFIX . "users.access < " . (INCLUDE_ADMIN ? "10" : "8") . "
|
||||
AND " . TB_PREFIX . "users.tribe <= 3 ORDER BY totalpop DESC, totalvillages DESC, userid DESC";
|
||||
}
|
||||
|
||||
$result = (mysql_query($q));
|
||||
while($row = mysql_fetch_assoc($result)) {
|
||||
$result = (mysqli_query($GLOBALS['link'],$q));
|
||||
while($row = mysqli_fetch_assoc($result)) {
|
||||
$datas[] = $row;
|
||||
}
|
||||
|
||||
@@ -291,13 +290,13 @@
|
||||
}
|
||||
|
||||
public function procRankRaceArray($race) {
|
||||
global $database, $multisort;
|
||||
//$array = $database->getRanking();
|
||||
global $multisort;
|
||||
//$array = $GLOBALS['db']->getRanking();
|
||||
$holder = array();
|
||||
//$value['totalvillage'] = count($database->getVillagesID($value['id']));
|
||||
//$value['totalvillage'] = count($database->getVillagesID($value['id']));
|
||||
//$value['totalpop'] = $database->getVSumField($value['id'],"pop");
|
||||
//$value['aname'] = $database->getAllianceName($value['alliance']);
|
||||
//$value['totalvillage'] = count($GLOBALS['db']->getVillagesID($value['id']));
|
||||
//$value['totalvillage'] = count($GLOBALS['db']->getVillagesID($value['id']));
|
||||
//$value['totalpop'] = $GLOBALS['db']->getVSumField($value['id'],"pop");
|
||||
//$value['aname'] = $GLOBALS['db']->getAllianceName($value['alliance']);
|
||||
$q = "SELECT " . TB_PREFIX . "users.id userid, " . TB_PREFIX . "users.tribe tribe, " . TB_PREFIX . "users.username username," . TB_PREFIX . "users.alliance alliance, (
|
||||
|
||||
SELECT SUM( " . TB_PREFIX . "vdata.pop )
|
||||
@@ -320,12 +319,12 @@
|
||||
ORDER BY totalpop DESC, totalvillages DESC, userid DESC";
|
||||
|
||||
|
||||
$result = (mysql_query($q));
|
||||
while($row = mysql_fetch_assoc($result)) {
|
||||
$result = (mysqli_query($GLOBALS['link'],$q));
|
||||
while($row = mysqli_fetch_assoc($result)) {
|
||||
$datas[] = $row;
|
||||
}
|
||||
|
||||
if(mysql_num_rows($result)) {
|
||||
if(mysqli_num_rows($result)) {
|
||||
|
||||
|
||||
foreach($datas as $result) {
|
||||
@@ -356,12 +355,12 @@
|
||||
}
|
||||
|
||||
public function procAttRankArray() {
|
||||
global $database, $multisort;
|
||||
//$array = $database->getRanking();
|
||||
global $multisort;
|
||||
//$array = $GLOBALS['db']->getRanking();
|
||||
$holder = array();
|
||||
|
||||
//$value['totalvillage'] = count($database->getVillagesID($value['id']));
|
||||
//$value['totalpop'] = $database->getVSumField($value['id'],"pop");
|
||||
//$value['totalvillage'] = count($GLOBALS['db']->getVillagesID($value['id']));
|
||||
//$value['totalpop'] = $GLOBALS['db']->getVSumField($value['id'],"pop");
|
||||
$q = "SELECT " . TB_PREFIX . "users.id userid, " . TB_PREFIX . "users.username username, " . TB_PREFIX . "users.apall, (
|
||||
|
||||
SELECT COUNT( " . TB_PREFIX . "vdata.wref )
|
||||
@@ -376,8 +375,8 @@
|
||||
FROM " . TB_PREFIX . "users
|
||||
WHERE " . TB_PREFIX . "users.apall >=0 AND " . TB_PREFIX . "users.access < " . (INCLUDE_ADMIN ? "10" : "8") . " AND " . TB_PREFIX . "users.tribe <= 3
|
||||
ORDER BY " . TB_PREFIX . "users.apall DESC, pop DESC, userid DESC";
|
||||
$result = mysql_query($q) or die(mysql_error());
|
||||
while($row = mysql_Fetch_assoc($result)) {
|
||||
$result = mysqli_query($GLOBALS['link'],$q) or die(mysqli_error());
|
||||
while($row = mysqli_Fetch_assoc($result)) {
|
||||
$datas[] = $row;
|
||||
}
|
||||
|
||||
@@ -401,8 +400,8 @@
|
||||
}
|
||||
|
||||
public function procDefRankArray() {
|
||||
//global $database, $multisort;
|
||||
//$array = $database->getRanking();
|
||||
//global $GLOBALS['db'], $multisort;
|
||||
//$array = $GLOBALS['db']->getRanking();
|
||||
$holder = array();
|
||||
$q = "SELECT " . TB_PREFIX . "users.id userid, " . TB_PREFIX . "users.username username, " . TB_PREFIX . "users.dpall, (
|
||||
|
||||
@@ -418,8 +417,8 @@
|
||||
FROM " . TB_PREFIX . "users
|
||||
WHERE " . TB_PREFIX . "users.dpall >=0 AND " . TB_PREFIX . "users.access < " . (INCLUDE_ADMIN ? "10" : "8") . " AND " . TB_PREFIX . "users.tribe <= 3
|
||||
ORDER BY " . TB_PREFIX . "users.dpall DESC, pop DESC, userid DESC";
|
||||
$result = mysql_query($q) or die(mysql_error());
|
||||
while($row = mysql_Fetch_assoc($result)) {
|
||||
$result = mysqli_query($GLOBALS['link'],$q) or die(mysqli_error());
|
||||
while($row = mysqli_Fetch_assoc($result)) {
|
||||
$datas[] = $row;
|
||||
}
|
||||
|
||||
@@ -443,14 +442,14 @@
|
||||
}
|
||||
|
||||
public function procVRankArray() {
|
||||
global $database, $multisort;
|
||||
$array = $database->getVRanking();
|
||||
global $multisort;
|
||||
$array = $GLOBALS['db']->getVRanking();
|
||||
$holder = array();
|
||||
foreach($array as $value) {
|
||||
$coor = $database->getCoor($value['wref']);
|
||||
$coor = $GLOBALS['db']->getCoor($value['wref']);
|
||||
$value['x'] = $coor['x'];
|
||||
$value['y'] = $coor['y'];
|
||||
$value['user'] = $database->getUserField($value['owner'], "username", 0);
|
||||
$value['user'] = $GLOBALS['db']->getUserField($value['owner'], "username", 0);
|
||||
|
||||
array_push($holder, $value);
|
||||
}
|
||||
@@ -463,15 +462,15 @@
|
||||
}
|
||||
|
||||
public function procARankArray() {
|
||||
global $database, $multisort;
|
||||
$array = $database->getARanking();
|
||||
global $multisort;
|
||||
$array = $GLOBALS['db']->getARanking();
|
||||
$holder = array();
|
||||
|
||||
foreach($array as $value) {
|
||||
$memberlist = $database->getAllMember($value['id']);
|
||||
$memberlist = $GLOBALS['db']->getAllMember($value['id']);
|
||||
$totalpop = 0;
|
||||
foreach($memberlist as $member) {
|
||||
$totalpop += $database->getVSumField($member['id'], "pop");
|
||||
$totalpop += $GLOBALS['db']->getVSumField($member['id'], "pop");
|
||||
}
|
||||
$value['players'] = count($memberlist);
|
||||
$value['totalpop'] = $totalpop;
|
||||
@@ -492,11 +491,11 @@
|
||||
}
|
||||
|
||||
public function procHeroRankArray() {
|
||||
global $database, $multisort;
|
||||
$array = $database->getHeroRanking();
|
||||
global $multisort;
|
||||
$array = $GLOBALS['db']->getHeroRanking();
|
||||
$holder = array();
|
||||
foreach($array as $value) {
|
||||
$value['owner'] = $database->getUserField($value['uid'], "username", 0);
|
||||
$value['owner'] = $GLOBALS['db']->getUserField($value['uid'], "username", 0);
|
||||
$value['level'];
|
||||
$value['name'];
|
||||
$value['uid'];
|
||||
@@ -512,11 +511,11 @@
|
||||
}
|
||||
|
||||
public function procAAttRankArray() {
|
||||
global $database, $multisort;
|
||||
$array = $database->getARanking();
|
||||
global $multisort;
|
||||
$array = $GLOBALS['db']->getARanking();
|
||||
$holder = array();
|
||||
foreach($array as $value) {
|
||||
$memberlist = $database->getAllMember($value['id']);
|
||||
$memberlist = $GLOBALS['db']->getAllMember($value['id']);
|
||||
$totalap = 0;
|
||||
foreach($memberlist as $member) {
|
||||
$totalap += $member['ap'];
|
||||
@@ -540,11 +539,11 @@
|
||||
}
|
||||
|
||||
public function procADefRankArray() {
|
||||
global $database, $multisort;
|
||||
$array = $database->getARanking();
|
||||
global $multisort;
|
||||
$array = $GLOBALS['db']->getARanking();
|
||||
$holder = array();
|
||||
foreach($array as $value) {
|
||||
$memberlist = $database->getAllMember($value['id']);
|
||||
$memberlist = $GLOBALS['db']->getAllMember($value['id']);
|
||||
$totaldp = 0;
|
||||
foreach($memberlist as $member) {
|
||||
$totaldp += $member['dp'];
|
||||
|
||||
Reference in New Issue
Block a user