Skip to content

Commit

Permalink
Support for webservice (guild icons) (#278)
Browse files Browse the repository at this point in the history 
* Support for webservice

Added support for guild icons

* Fix typo

* Fix typo

* Fixed typo

* Fix typo

* Fix typo

* Fix typo
  • Loading branch information
@Balferian
Balferian committed Aug 24, 2021
1 parent 8250167 commit 81b895e
Show file tree
Hide file tree
Showing 16 changed files with 174 additions and 45 deletions.
1 change: 1 addition & 0 deletions config/application.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
'JobImageNameFormat' => '%d.gif', // The filename format for job images (defaults to {jobid}.gif).
'ForceEmptyEmblem' => false, // Forcefully display empty guild emblems, helpful when you don't have GD2 installed.
'EmblemCacheInterval' => 12, // Hourly interval to re-cache guild emblems (set to 0 to disable emblem cache).
'EmblemUseWebservice' => true, // Load emblems from WebService?
'SessionCookieExpire' => 48, // Duration in hours.
'AdminMenuGroupLevel' => AccountLevel::LOWGM, // The starting group ID for which module actions are moved into the admin menu for display.
'DateDefaultTimezone' => 'UTC', // The default timezone, consult the PHP manual for valid timezones: http://php.net/timezones (null for defaut system TZ)
Expand Down
8 changes: 7 additions & 1 deletion modules/account/view.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,15 @@
foreach ($session->getAthenaServerNames() as $serverName) {
$athena = $session->getAthenaServer($serverName);

$sql = "SELECT ch.*, guild.name AS guild_name, guild.emblem_len AS guild_emblem_len ";
$sql = "SELECT ch.*, guild.name AS guild_name, ";
if(Flux::config('EmblemUseWebservice'))
$sql .= "guild_emblems.file_data as guild_emblem_len ";
else
$sql .= "guild.emblem_len AS guild_emblem_len ";
$sql .= "FROM {$athena->charMapDatabase}.`char` AS ch ";
$sql .= "LEFT OUTER JOIN {$athena->charMapDatabase}.guild ON guild.guild_id = ch.guild_id ";
if(Flux::config('EmblemUseWebservice'))
$sql .= "LEFT JOIN {$server->charMapDatabase}.`guild_emblems` ON `guild_emblems`.guild_id = guild.guild_id ";
$sql .= "WHERE ch.account_id = ? ORDER BY ch.char_num ASC";
$sth = $server->connection->getStatement($sql);
$sth->execute(array($accountID));
Expand Down
9 changes: 8 additions & 1 deletion modules/castle/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,15 @@
$castleNames = Flux::config('CastleNames')->toArray();
$ids = implode(',', array_fill(0, count($castleNames), '?'));

$sql = "SELECT castles.castle_id, castles.guild_id, guild.name AS guild_name, guild.emblem_len FROM {$server->charMapDatabase}.guild_castle AS castles ";
$sql = "SELECT castles.castle_id, castles.guild_id, guild.name AS guild_name, ";
if(Flux::config('EmblemUseWebservice'))
$sql .= "guild_emblems.file_data as emblem_len ";
else
$sql .= "guild.emblem_len ";
$sql .= "FROM {$server->charMapDatabase}.guild_castle AS castles ";
$sql .= "LEFT JOIN guild ON guild.guild_id = castles.guild_id ";
if(Flux::config('EmblemUseWebservice'))
$sql .= "LEFT JOIN {$server->charMapDatabase}.`guild_emblems` ON `guild_emblems`.guild_id = castles.guild_id ";
$sql .= "WHERE castles.castle_id IN ($ids)";
$sql .= "ORDER BY castles.castle_id ASC";
$sth = $server->connection->getStatement($sql);
Expand Down
9 changes: 8 additions & 1 deletion modules/character/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
$sqlpartial .= "LEFT OUTER JOIN {$server->charMapDatabase}.`char` AS mother ON mother.char_id = ch.mother ";
$sqlpartial .= "LEFT OUTER JOIN {$server->charMapDatabase}.`char` AS father ON father.char_id = ch.father ";
$sqlpartial .= "LEFT OUTER JOIN {$server->charMapDatabase}.`char` AS child ON child.char_id = ch.child ";
if(Flux::config('EmblemUseWebservice'))
$sqlpartial .= "LEFT JOIN {$server->charMapDatabase}.`guild_emblems` ON `guild_emblems`.guild_id = ch.guild_id ";

$sqlwhere = "WHERE 1=1 ";
$sqlcount = '';

Expand Down Expand Up @@ -166,7 +169,11 @@

$col = "ch.account_id, ch.char_id, ch.name AS char_name, ch.char_num, ";
$col .= "ch.online, ch.base_level, ch.job_level, ch.class, ch.zeny, ";
$col .= "guild.guild_id, guild.name AS guild_name, guild.emblem_len AS guild_emblem_len, ";
$col .= "guild.guild_id, guild.name AS guild_name, ";
if(Flux::config('EmblemUseWebservice'))
$col .= "guild_emblems.file_data as guild_emblem_len, ";
else
$col .= "guild.emblem_len as guild_emblem_len, ";
$col .= "login.userid, partner.name AS partner_name, partner.char_id AS partner_id, ";
$col .= "mother.name AS mother_name, mother.char_id AS mother_id, ";
$col .= "father.name AS father_name, father.char_id AS father_id, ";
Expand Down
8 changes: 7 additions & 1 deletion modules/character/online.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

$sqlpartial = "LEFT JOIN {$server->loginDatabase}.login ON login.account_id = ch.account_id ";
$sqlpartial .= "LEFT JOIN {$server->charMapDatabase}.guild ON guild.guild_id = ch.guild_id ";
if(Flux::config('EmblemUseWebservice'))
$sqlpartial .= "LEFT JOIN {$server->charMapDatabase}.`guild_emblems` ON `guild_emblems`.guild_id = ch.guild_id ";

if (!$auth->allowedToIgnoreHiddenPref) {
$sqlpartial .= "LEFT JOIN {$server->charMapDatabase}.$charPrefsTable AS pref1 ON ";
Expand Down Expand Up @@ -98,7 +100,11 @@
$hiddenCount = (int)$sth->fetch()->total;

$col = "ch.char_id, ch.name AS char_name, ch.class AS char_class, ch.base_level, ch.job_level, ";
$col .= "guild.name AS guild_name, guild.guild_id, guild.emblem_len AS guild_emblem_len, ch.last_map, pref2.value AS hidemap";
$col .= "guild.name AS guild_name, guild.guild_id, ch.last_map, pref2.value AS hidemap, ";
if(Flux::config('EmblemUseWebservice'))
$col .= "guild_emblems.file_data as guild_emblem_len ";
else
$col .= "guild.emblem_len as guild_emblem_len ";

$sql = $paginator->getSQL("SELECT $col FROM {$server->charMapDatabase}.`char` AS ch $sqlpartial");
$sth = $server->connection->getStatement($sql);
Expand Down
24 changes: 21 additions & 3 deletions modules/character/view.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,11 @@
$col .= "mother.name AS mother_name, mother.char_id AS mother_id, ";
$col .= "father.name AS father_name, father.char_id AS father_id, ";
$col .= "child.name AS child_name, child.char_id AS child_id, ";
$col .= "guild.guild_id, guild.name AS guild_name, guild.emblem_len AS guild_emblem_len, ";
$col .= "guild.guild_id, guild.name AS guild_name, ";
if(Flux::config('EmblemUseWebservice'))
$col .= "guild_emblems.file_data as guild_emblem_len, ";
else
$col .= "guild.emblem_len as guild_emblem_len, ";
$col .= "guild_position.name AS guild_position, IFNULL(guild_position.exp_mode, 0) AS guild_tax, ";
$col .= "party.name AS party_name, party.leader_char AS party_leader_id, party_leader.name AS party_leader_name, ";

Expand Down Expand Up @@ -63,6 +67,8 @@
$sql .= "LEFT OUTER JOIN {$server->charMapDatabase}.`".$mobdb[0]."` AS pet_mob ON pet_mob.ID = pet.class ";
$sql .= "LEFT OUTER JOIN {$server->charMapDatabase}.`".$mobdb[1]."` AS pet_mob2 ON pet_mob2.ID = pet.class ";
$sql .= "LEFT OUTER JOIN {$server->charMapDatabase}.`char_reg_num` AS reg ON reg.char_id = ch.char_id AND reg.key = 'PC_DIE_COUNTER' ";
if(Flux::config('EmblemUseWebservice'))
$sql .= "LEFT OUTER JOIN {$server->charMapDatabase}.`guild_emblems` ON `guild_emblems`.guild_id = ch.guild_id ";
$sql .= "WHERE ch.char_id = ?";

$sth = $server->connection->getStatement($sql);
Expand All @@ -89,9 +95,15 @@
$title = "Viewing Character ({$char->char_name})";

$sql = "SELECT fr.char_id, fr.name, fr.class, fr.base_level, fr.job_level, ";
$sql .= "guild.guild_id, guild.name AS guild_name, guild.emblem_len AS guild_emblem_len, fr.online ";
$sql .= "guild.guild_id, guild.name AS guild_name, fr.online, ";
if(Flux::config('EmblemUseWebservice'))
$sql .= "guild_emblems.file_data as guild_emblem_len ";
else
$sql .= "guild.emblem_len as guild_emblem_len ";
$sql .= "FROM {$server->charMapDatabase}.`char` AS fr ";
$sql .= "LEFT OUTER JOIN {$server->charMapDatabase}.guild ON guild.guild_id = fr.guild_id ";
if(Flux::config('EmblemUseWebservice'))
$sql .= "LEFT JOIN {$server->charMapDatabase}.`guild_emblems` ON `guild_emblems`.guild_id = fr.guild_id ";
$sql .= "LEFT OUTER JOIN {$server->charMapDatabase}.friends ON friends.friend_id = fr.char_id ";
$sql .= "WHERE friends.char_id = ? ORDER BY fr.name ASC";
$sth = $server->connection->getStatement($sql);
Expand All @@ -101,9 +113,15 @@

if ($char->party_leader_id) {
$sql = "SELECT p.char_id, p.name, p.class, p.base_level, p.job_level, ";
$sql .= "guild.guild_id, guild.name AS guild_name, p.online ";
$sql .= "guild.guild_id, guild.name AS guild_name, p.online, ";
if(Flux::config('EmblemUseWebservice'))
$sql .= "guild_emblems.file_data as guild_emblem_len ";
else
$sql .= "guild.emblem_len as guild_emblem_len ";
$sql .= "FROM {$server->charMapDatabase}.`char` AS p ";
$sql .= "LEFT OUTER JOIN {$server->charMapDatabase}.guild ON guild.guild_id = p.guild_id ";
if(Flux::config('EmblemUseWebservice'))
$sql .= "LEFT OUTER JOIN {$server->charMapDatabase}.`guild_emblems` ON `guild_emblems`.guild_id = p.guild_id ";
$sql .= "WHERE p.party_id = ? AND p.char_id != ? ORDER BY p.name ASC";
$sth = $server->connection->getStatement($sql);

Expand Down
62 changes: 43 additions & 19 deletions modules/guild/emblem.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,27 +47,51 @@ function flux_display_empty_emblem()
}
}

$db = $athenaServer->charMapDatabase;
$sql = "SELECT emblem_len, emblem_data FROM $db.guild WHERE guild_id = ? LIMIT 1";
$sth = $athenaServer->connection->getStatement($sql);
$sth->execute(array($guildID));
$res = $sth->fetch();

if (!$res || !$res->emblem_len)
flux_display_empty_emblem();
else {
require_once 'functions/imagecreatefrombmpstring.php';

$data = @gzuncompress(pack('H*', $res->emblem_data));
$image = imagecreatefrombmpstring($data);

header("Content-Type: image/png");
if(Flux::config('EmblemUseWebservice')) {
$db = $athenaServer->charMapDatabase;
$sql = "SELECT file_type, file_data FROM $db.guild_emblems WHERE guild_id = ? LIMIT 1";
$sth = $athenaServer->connection->getStatement($sql);
$sth->execute(array($guildID));
$res = $sth->fetch();

if ($interval)
imagepng($image, $filename);
if (!$res->file_data)
flux_display_empty_emblem();
else {
$image = imagecreatefromstring($res->file_data);
$rgb = imagecolorexact ($image, 255,0,255);
imagecolortransparent($image, $rgb);

header("Content-Type: image/png");

if ($interval)
imagepng($image, $filename);

imagepng($image);
exit;
}
} else {
$db = $athenaServer->charMapDatabase;
$sql = "SELECT emblem_len, emblem_data FROM $db.guild WHERE guild_id = ? LIMIT 1";
$sth = $athenaServer->connection->getStatement($sql);
$sth->execute(array($guildID));
$res = $sth->fetch();

imagepng($image);
exit;
if (!$res || !$res->emblem_len)
flux_display_empty_emblem();
else {
require_once 'functions/imagecreatefrombmpstring.php';

$data = @gzuncompress(pack('H*', $res->emblem_data));
$image = imagecreatefrombmpstring($data);

header("Content-Type: image/png");

if ($interval)
imagepng($image, $filename);

imagepng($image);
exit;
}
}
}
?>
10 changes: 8 additions & 2 deletions modules/guild/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

$bind = array();
$sqlpartial = "LEFT JOIN {$server->charMapDatabase}.`char` ON `char`.char_id = guild.char_id ";
if(Flux::config('EmblemUseWebservice'))
$sqlpartial .= "LEFT JOIN {$server->charMapDatabase}.`guild_emblems` ON `guild_emblems`.guild_id = guild.guild_id ";
$sqlpartial .= "WHERE 1=1 ";

$guildID = $params->get('id');
Expand Down Expand Up @@ -83,8 +85,12 @@

$col = "guild.guild_id, guild.name AS guildName, guild.char_id AS charID, `char`.name AS charName, ";
$col .= "guild.guild_lv AS guildLevel, guild.connect_member AS connectMem, guild.max_member AS maxMem, ";
$col .= "guild.average_lv AS avgLevel, guild.emblem_len ";

$col .= "guild.average_lv AS avgLevel, ";
if(Flux::config('EmblemUseWebservice'))
$col .= "guild_emblems.file_data as emblem_len ";
else
$col .= "guild.emblem_len ";

$sql = "SELECT $col FROM {$server->charMapDatabase}.`guild` $sqlpartial";
$sql = $paginator->getSQL($sql);
$sth = $server->connection->getStatement($sql);
Expand Down
13 changes: 10 additions & 3 deletions modules/guild/view.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,16 @@

$col = "guild.guild_id, guild.name, guild.char_id, guild.master, guild.guild_lv, guild.connect_member, guild.max_member, ";
$col .= "guild.average_lv, guild.exp, guild.next_exp, guild.skill_point, REPLACE(guild.mes1, '|00', '') AS mes1, REPLACE(guild.mes2, '|00', '') AS mes2, ";
$col .= "guild.emblem_len, guild.emblem_id, guild.emblem_data, `char`.name AS guild_master";

$sql = "SELECT $col FROM {$server->charMapDatabase}.guild LEFT JOIN {$server->charMapDatabase}.`char` ON `char`.char_id = guild.char_id ";
$col .= "guild.emblem_id, guild.emblem_data, `char`.name AS guild_master, ";
if(Flux::config('EmblemUseWebservice'))
$col .= "guild_emblems.file_data as emblem_len ";
else
$col .= "guild.emblem_len ";

$sql = "SELECT $col FROM {$server->charMapDatabase}.guild ";
$sql .= "LEFT JOIN {$server->charMapDatabase}.`char` ON `char`.char_id = guild.char_id ";
if(Flux::config('EmblemUseWebservice'))
$sql .= "LEFT JOIN {$server->charMapDatabase}.`guild_emblems` ON `guild_emblems`.guild_id = `char`.guild_id ";
$sql .= "WHERE guild.guild_id = ?";

$sth = $server->connection->getStatement($sql);
Expand Down
8 changes: 7 additions & 1 deletion modules/ranking/alchemist.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,16 @@
}

$col = "ch.char_id, ch.name AS char_name, ch.fame, ch.class AS char_class, ch.base_level, ch.job_level, ";
$col .= "ch.guild_id, guild.name AS guild_name, guild.emblem_len AS guild_emblem_len";
$col .= "ch.guild_id, guild.name AS guild_name, ";
if(Flux::config('EmblemUseWebservice'))
$col .= "guild_emblems.file_data as guild_emblem_len ";
else
$col .= "guild.emblem_len AS guild_emblem_len ";

$sql = "SELECT $col FROM {$server->charMapDatabase}.`char` AS ch ";
$sql .= "LEFT JOIN {$server->charMapDatabase}.guild ON guild.guild_id = ch.guild_id ";
if(Flux::config('EmblemUseWebservice'))
$sql .= "LEFT JOIN {$server->charMapDatabase}.`guild_emblems` ON `guild_emblems`.guild_id = ch.guild_id ";
$sql .= "LEFT JOIN {$server->loginDatabase}.login ON login.account_id = ch.account_id ";

$ids = implode(',', array_fill(0, count($alchemistJobs), '?'));
Expand Down
8 changes: 7 additions & 1 deletion modules/ranking/blacksmith.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,16 @@
}

$col = "ch.char_id, ch.name AS char_name, ch.fame, ch.class AS char_class, ch.base_level, ch.job_level, ";
$col .= "ch.guild_id, guild.name AS guild_name, guild.emblem_len AS guild_emblem_len";
$col .= "ch.guild_id, guild.name AS guild_name, ";
if(Flux::config('EmblemUseWebservice'))
$col .= "guild_emblems.file_data as guild_emblem_len ";
else
$col .= "guild.emblem_len AS guild_emblem_len ";

$sql = "SELECT $col FROM {$server->charMapDatabase}.`char` AS ch ";
$sql .= "LEFT JOIN {$server->charMapDatabase}.guild ON guild.guild_id = ch.guild_id ";
if(Flux::config('EmblemUseWebservice'))
$sql .= "LEFT JOIN {$server->charMapDatabase}.`guild_emblems` ON `guild_emblems`.guild_id = ch.guild_id ";
$sql .= "LEFT JOIN {$server->loginDatabase}.login ON login.account_id = ch.account_id ";

$ids = implode(',', array_fill(0, count($blacksmithJobs), '?'));
Expand Down
8 changes: 7 additions & 1 deletion modules/ranking/character.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,16 @@
}

$col = "ch.char_id, ch.name AS char_name, ch.class AS char_class, ch.base_level, ch.base_exp, ch.job_level, ch.job_exp, ";
$col .= "ch.guild_id, guild.name AS guild_name, guild.emblem_len AS guild_emblem_len";
$col .= "ch.guild_id, guild.name AS guild_name, ";
if(Flux::config('EmblemUseWebservice'))
$col .= "guild_emblems.file_data as guild_emblem_len ";
else
$col .= "guild.emblem_len AS guild_emblem_len ";

$sql = "SELECT $col FROM {$server->charMapDatabase}.`char` AS ch ";
$sql .= "LEFT JOIN {$server->charMapDatabase}.guild ON guild.guild_id = ch.guild_id ";
if(Flux::config('EmblemUseWebservice'))
$sql .= "LEFT JOIN {$server->charMapDatabase}.`guild_emblems` ON `guild_emblems`.guild_id = ch.guild_id ";
$sql .= "LEFT JOIN {$server->loginDatabase}.login ON login.account_id = ch.account_id ";
$sql .= "WHERE 1=1 ";

Expand Down
9 changes: 8 additions & 1 deletion modules/ranking/death.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,18 @@
}

$col = "ch.char_id, ch.name AS char_name, ch.class AS char_class, ch.base_level, ch.job_level, ";
$col .= "ch.guild_id, guild.name AS guild_name, guild.emblem_len AS guild_emblem_len, ";
$col .= "ch.guild_id, guild.name AS guild_name, ";
if(Flux::config('EmblemUseWebservice'))
$col .= "guild_emblems.file_data as guild_emblem_len, ";
else
$col .= "guild.emblem_len AS guild_emblem_len, ";

$col .= "CAST(IFNULL(reg.value, '0') AS UNSIGNED) AS death_count";

$sql = "SELECT $col FROM {$server->charMapDatabase}.`char` AS ch ";
$sql .= "LEFT JOIN {$server->charMapDatabase}.guild ON guild.guild_id = ch.guild_id ";
if(Flux::config('EmblemUseWebservice'))
$sql .= "LEFT JOIN {$server->charMapDatabase}.`guild_emblems` ON `guild_emblems`.guild_id = ch.guild_id ";
$sql .= "LEFT JOIN {$server->loginDatabase}.login ON login.account_id = ch.account_id ";
$sql .= "LEFT JOIN {$server->charMapDatabase}.`char_reg_num` AS reg ON reg.char_id = ch.char_id AND reg.key = 'PC_DIE_COUNTER' ";
$sql .= "WHERE 1=1 ";
Expand Down
8 changes: 7 additions & 1 deletion modules/ranking/guild.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,20 @@
$ids = implode(',', array_fill(0, count($castleNames), '?'));
$bind = array_keys($castleNames);

$col = "g.guild_id, g.name, g.guild_lv, g.average_lv, g.emblem_len, ";
$col = "g.guild_id, g.name, g.guild_lv, g.average_lv, ";
if(Flux::config('EmblemUseWebservice'))
$col .= "guild_emblems.file_data as emblem_len, ";
else
$col .= "g.emblem_len, ";
$col .= "GREATEST(g.exp, (SELECT SUM(exp) FROM {$server->charMapDatabase}.guild_member WHERE guild_member.guild_id = g.guild_id)) AS exp, ";
$col .= "(SELECT COUNT(char_id) FROM {$server->charMapDatabase}.`char` WHERE `char`.guild_id = g.guild_id) AS members, ";
$col .= "(SELECT COUNT(castle_id) FROM {$server->charMapDatabase}.guild_castle WHERE guild_castle.guild_id = g.guild_id AND castle_id IN ($ids)) AS castles";

$sql = "SELECT $col FROM {$server->charMapDatabase}.guild AS g ";
$sql .= "LEFT JOIN {$server->charMapDatabase}.`char` AS ch ON ch.char_id = g.char_id ";
$sql .= "LEFT JOIN {$server->loginDatabase}.login ON login.account_id = ch.account_id ";
if(Flux::config('EmblemUseWebservice'))
$sql .= "LEFT JOIN {$server->charMapDatabase}.`guild_emblems` ON `guild_emblems`.guild_id = g.guild_id ";

$groups = AccountLevel::getGroupID((int)Flux::config('RankingHideGroupLevel'), '<');
if(!empty($groups)) {
Expand Down
8 changes: 7 additions & 1 deletion modules/ranking/zeny.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,18 @@
$charPrefsTable = Flux::config('FluxTables.CharacterPrefsTable');

$col = "ch.char_id, ch.name AS char_name, ch.zeny, ch.class AS char_class, ch.base_level, ch.base_exp, ch.job_level, ch.job_exp, ";
$col .= "ch.guild_id, guild.name AS guild_name, guild.emblem_len AS guild_emblem_len";
$col .= "ch.guild_id, guild.name AS guild_name, ";
if(Flux::config('EmblemUseWebservice'))
$col .= "guild_emblems.file_data as guild_emblem_len ";
else
$col .= "guild.emblem_len AS guild_emblem_len ";

$sql = "SELECT $col FROM {$server->charMapDatabase}.`char` AS ch ";
$sql .= "LEFT JOIN {$server->charMapDatabase}.$charPrefsTable AS hide_from_zr ON ";
$sql .= "(hide_from_zr.name = 'HideFromZenyRanking' AND hide_from_zr.char_id = ch.char_id) ";
$sql .= "LEFT JOIN {$server->charMapDatabase}.guild ON guild.guild_id = ch.guild_id ";
if(Flux::config('EmblemUseWebservice'))
$sql .= "LEFT JOIN {$server->charMapDatabase}.`guild_emblems` ON `guild_emblems`.guild_id = ch.guild_id ";
$sql .= "LEFT JOIN {$server->loginDatabase}.login ON login.account_id = ch.account_id ";
$sql .= "WHERE 1=1 ";

Expand Down

0 comments on commit 81b895e

Please sign in to comment.