Digitalstack/ZnoteAAC
2
0
Fork 0
mirror of https://github.com/Znote/ZnoteAAC.git synced 2025-04-30 11:19:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed guilds for TFS 0.3.6

Browse Source
This commit is contained in:
Stefan Brannfjell 2014-06-18 22:40:57 +02:00
parent d7adcd1990
commit 074cd7a8d0
2 changed files with 38 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/function/users.php
View File

@ -504,7 +504,7 @@ function get_guilds_list() {
// Get array of player data related to a guild. // Get array of player data related to a guild.
function get_guild_players($gid) { function get_guild_players($gid) {
$gid = (int)$gid; // Sanitizing the parameter id $gid = (int)$gid; // Sanitizing the parameter id
if (config('TFSVersion') !== 'TFS_10') return mysql_select_multi("SELECT p.rank_id, p.name, p.level, p.vocation FROM players AS p LEFT JOIN guild_ranks AS gr ON gr.id = p.rank_id WHERE gr.guild_id ='$gid';"); if (config('TFSVersion') !== 'TFS_10') return mysql_select_multi("SELECT p.rank_id, p.name, p.level, p.vocation, p.online, gr.name AS `rank_name` FROM players AS p LEFT JOIN guild_ranks AS gr ON gr.id = p.rank_id WHERE gr.guild_id ='$gid' ORDER BY gr.id, p.name;");
else return mysql_select_multi("SELECT p.id, p.name, p.level, p.vocation, gm.rank_id, gr.name AS `rank_name` FROM players AS p LEFT JOIN guild_membership AS gm ON gm.player_id = p.id LEFT JOIN guild_ranks AS gr ON gr.id = gm.rank_id WHERE gm.guild_id = '$gid' ORDER BY gm.rank_id, p.name"); else return mysql_select_multi("SELECT p.id, p.name, p.level, p.vocation, gm.rank_id, gr.name AS `rank_name` FROM players AS p LEFT JOIN guild_membership AS gm ON gm.player_id = p.id LEFT JOIN guild_ranks AS gr ON gr.id = gm.rank_id WHERE gm.guild_id = '$gid' ORDER BY gm.rank_id, p.name");
} }

18
guilds.php
View File

@ -205,18 +205,12 @@ if (user_logged_in() === true) {
$onlinelist[] = $online['player_id']; $onlinelist[] = $online['player_id'];
} }
} }
//data_dump($players, false, "Data");
foreach ($players as $player) { foreach ($players as $player) {
if ($config['TFSVersion'] !== 'TFS_10') { if ($config['TFSVersion'] !== 'TFS_10') {
if ($isOtx) { $chardata['online'] = $player['online'];
$chardata = mysql_select_single("SELECT `online` FROM `players` WHERE `name`='".$player['name']."' LIMIT 1;");
} else $chardata = user_character_data($player['id'], 'online');
} else $chardata['online'] = (in_array($player['id'], $onlinelist)) ? 1 : 0; } else $chardata['online'] = (in_array($player['id'], $onlinelist)) ? 1 : 0;
echo '<tr>'; echo '<tr>';
if ($isOtx) {
$rankdata = mysql_select_single("SELECT `name` FROM `guild_ranks` WHERE `id`='".$player['rank_id']."' LIMIT 1;");
$player['rank_name'] = $rankdata['name'];
}
echo '<td>'. $player['rank_name'] .'</td>'; echo '<td>'. $player['rank_name'] .'</td>';
echo '<td><a href="characterprofile.php?name='. $player['name'] .'">'. $player['name'] .'</a></td>'; echo '<td><a href="characterprofile.php?name='. $player['name'] .'">'. $player['name'] .'</a></td>';
echo '<td>'. $player['level'] .'</td>'; echo '<td>'. $player['level'] .'</td>';
@ -776,6 +770,7 @@ if ($highest_access >= 2) {
?> ?>
<!-- end leader--> <!-- end leader-->
<?php <?php
if ($config['guildwar_enabled'] === true) {
if ($config['TFSVersion'] == 'TFS_02' || $config['TFSVersion'] == 'TFS_10') $wardata = get_guild_wars(); if ($config['TFSVersion'] == 'TFS_02' || $config['TFSVersion'] == 'TFS_10') $wardata = get_guild_wars();
else if ($config['TFSVersion'] == 'TFS_03') $wardata = get_guild_wars03(); else if ($config['TFSVersion'] == 'TFS_03') $wardata = get_guild_wars03();
else die("Can't recognize TFS version. It has to be either TFS_02 or TFS_03. Correct this in config.php"); else die("Can't recognize TFS version. It has to be either TFS_02 or TFS_03. Correct this in config.php");
@ -785,7 +780,7 @@ if ($wardata !== false) {
if ($wars['guild1'] == $gid || $wars['guild2'] == $gid) $war_exist = true; if ($wars['guild1'] == $gid || $wars['guild2'] == $gid) $war_exist = true;
} }
} }
if ($war_exist && $config['guildwar_enabled'] === true) { if ($war_exist) {
?> ?>
<h2>War overview:</h2> <h2>War overview:</h2>
<table> <table>
@ -809,7 +804,10 @@ if ($war_exist && $config['guildwar_enabled'] === true) {
} }
?> ?>
</table> </table>
<?php } ?> <?php
}
}
?>
<!-- leave guild with character --> <!-- leave guild with character -->
<?php <?php
$bool = false; $bool = false;