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

refactor: getProfileVillages() takes multiple IDs

Browse Source 
#313
This commit is contained in:
Martin Ambrus
2017-11-19 15:57:52 +01:00
parent 699781d130
commit 24789507a7
5 changed files with 77 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Automation.php
+9
View File
@@ -4644,6 +4644,15 @@ class Automation {
global $database;
$q = "SELECT id, invited FROM ".TB_PREFIX."users WHERE invited > 0";
$array = $database->query_return($q);
// preload villages data
$userIDs = [];
foreach($array as $user) {
$userIDs[] = $user['id'];
}
$database->getProfileVillages($userIDs);
// continue...
foreach($array as $user) {
$numusers = mysqli_fetch_array(mysqli_query($GLOBALS['link'],"SELECT Count(*) as Total FROM ".TB_PREFIX."users WHERE id = ".(int) $user['invited']), MYSQLI_ASSOC);
if($numusers['Total'] > 0){
GameEngine/Database.php
+33 -6
View File
@@ -1561,19 +1561,46 @@ class MYSQLi_DB implements IDbConnection {
}
function getProfileVillages($uid, $use_cache = true) {
list($uid) = $this->escape_input((int) $uid);
$arrayPassed = is_array($uid);
if (!$arrayPassed) {
$uid = [(int) $uid];
} else {
foreach ($uid as $index => $uidValue) {
$uid[$index] = (int) $uidValue;
}
}
if (!count($uid)) {
return [];
}
// first of all, check if we should be using cache and whether the field
// required is already cached
if ($use_cache && ($cachedValue = self::returnCachedContent(self::$profileVillagesCache, $uid)) && !is_null($cachedValue)) {
if ($use_cache && !$arrayPassed && ($cachedValue = self::returnCachedContent(self::$profileVillagesCache, $uid[0])) && !is_null($cachedValue)) {
return $cachedValue;
}
$q = "SELECT capital,wref,name,pop,created from " . TB_PREFIX . "vdata where owner = $uid order by pop desc";
$result = mysqli_query($this->dblink,$q);
$q = "SELECT capital,wref,name,pop,created,owner from " . TB_PREFIX . "vdata where owner IN(".implode(', ', $uid).") order by pop desc";
$result = mysqli_query($this->dblink,$q);
self::$profileVillagesCache[$uid] = $this->mysqli_fetch_all($result);
return self::$profileVillagesCache[$uid];
if (!$arrayPassed) {
$result = $this->mysqli_fetch_all($result);
self::$profileVillagesCache[ $uid[0] ] = $result;
} else {
// we're preloading, cache all the data individually
if (mysqli_num_rows($result)) {
while ( $row = mysqli_fetch_array( $result, MYSQLI_ASSOC ) ) {
if ( ! isset( self::$profileVillagesCache[ $row['owner'] ] ) ) {
self::$profileVillagesCache[ $row['owner'] ] = [];
}
self::$profileVillagesCache[ $row['owner'] ][] = $row;
}
}
}
return $result;
}
// no need to refactor this method