roelv

Does anyone know if it's safe against SQL injections?

Your changes for Trintiy don't work yet because the arena_team_stats table no longer exists. Anyway I found some time to look into it myself and it is working for me now. I will post the code I changed. I think my changes in arena-ladder.php also affect mangos users making their armory not work anymore so you will have to make that Trinity only. arena-ladder.php if(isset($_GET['sf'])) { switch($_GET['sf']) { case 'rank': // rank case 'name': // name case 'sgw': // wins case 'sgl': // lose case 'rating': // rating if($_GET['sf'] == 'name') { $sort = '`arena_team`.`name`'; } elseif($_GET['sf'] == 'sgw') { $sort = '`arena_team`.`weekWins`'; } elseif($_GET['sf'] == 'sgl') { $sort = 'lose'; // Unique sorting } else { $sort = '`arena_team`.`' . $_GET['sf'] .'`'; } if(!isset($_GET['sd'])) { $type = 'ASC'; } elseif($_GET['sd'] == 'a') { $type = 'ASC'; } elseif($_GET['sd'] == 'd') { $type = 'DESC'; } break; } } includes/classes/class.arenateams.php line 116 `weekWins` AS `gamesWon`, line 309 case SERVER_TRINITY: $realmArenaTeamInfo = $db->select(" SELECT `arena_team`.`arenaTeamId` AS `arenateamid`, `arena_team`.`name`, `arena_team`.`rating`, `arena_team`.`weekGames` AS `gamesPlayed`, `arena_team`.`weekWins` AS `gamesWon`, `arena_team`.`rank` AS `ranking`, `arena_team`.`seasonGames` AS `seasonGamesPlayed`, `arena_team`.`seasonWins` AS `seasonGamesWon`, `characters`.`race`, `arena_team`.`seasonGames`-`arena_team`.`seasonWins` AS `lose` FROM `arena_team` AS `arena_team` LEFT JOIN `characters` AS `characters` ON `characters`.`guid`=`arena_team`.`captainguid` WHERE `arena_team`.`type`=%d AND `arena_team`.`rank` > 0 ORDER BY `lose` %s LIMIT %d, 20", $type, $sort, $page); break; line 351 case SERVER_TRINITY: $realmArenaTeamInfo = $db->select(" SELECT `arena_team`.`arenaTeamId` AS `arenateamid`, `arena_team`.`name`, `arena_team`.`rating`, `arena_team`.`weekGames` AS `gamesPlayed`, `arena_team`.`weekWins` AS `gamesWon`, `arena_team`.`rank` AS `ranking`, `arena_team`.`seasonGames` AS `seasonGamesPlayed`, `arena_team`.`seasonWins` AS `seasonGamesWon`, `characters`.`race` FROM `arena_team` AS `arena_team` LEFT JOIN `characters` AS `characters` ON `characters`.`guid`=`arena_team`.`captainGuid` WHERE `arena_team`.`type`=%d AND `arena_team`.`rank` > 0 ORDER BY %s %s LIMIT %d, 20", $type, $order, $sort, $page); break;

TC just changed the arena database layout, you aren't going to like that though I think it shouldn't be too much work to adjust the armory to it. I will try to do this myself when I get to the point of updating to that core and post the changes here if you didn't do it yourself yet https://github.com/TrinityCore/TrinityCore/commit/ae3ab32ea5bf697a7b3f6d1fbc0740d7404d7c92

New arena patch works fine thanks! Although not everything is showing correctly in the armory like match start time and lenght.

After the latest changes I can't see arena teams in the arena ladder anymore (Trinity).

It's still `arena_team_stats`, maybe they forgot something in the dumb...

Do NOT use the new Trinity patch, you need to change the last part in this: - ((InstanceMap *)m)->PermBindAllPlayers(creditedPlayer); + { + ((InstanceMap *)m)->PermBindAllPlayers(creditedPlayer); + /** World of Warcraft Armory **/ + creditedPlayer->WriteWowArmoryDatabaseLog(3, creature->GetCreatureInfo()->Entry); + /** World of Warcraft Armory **/ + } } else { Else no instances will get bound to you. 1 line of code can change so much...

It seems like the new arena patch is also causing crashes...

Ok maybe because I use the Linux version of Chrome, Chromium. But the tooltips work in firefox.

The talent page works. You need to test with Firefox or Opera. For Google Chrome, the talent page, tooltips and the achievement page don't work. I don't know about Internet Explorer.

Some small problems when using Trinity: 1. The arena patch still causes crashes like described earlier. 2. Arena team icons have wrong colors. 3. Arena Rank images won't show properly, see screenshot.

This fixed team members of a 3v3 team not being displayed for me.

You need to apply the core patch, it won't get displayed until the data of the character is stored in the database by the patch.

confirmed, it's the arena patch (again)

I noticed the guild pages don't work anymore but I am not sure if this is caused by 395 or if it already existed before this revision. The weird thing, the debug log doesn't show anything about this thing. Anyway this is what the page shows: This page contains the following errors: error on line 1 at column 20: Extra content at the end of the document Below is a rendering of the page up to the first error. Fatal Error:

Thanks, it worked it won't compile without this change

The table that gets created for the armory is `armory_character_stats` which is something different.

This did the trick, compiled fine on single and mutli core, thank you!

It works fine for me except for the arena patch I always use experimental stuff so I can help them with reports about bugs. Anyway that doesn't mean the patch will suddenly work when it becomes "stable" again...

Like I said TC rev 9708 didn't compile for me with the arena patch but it compiled fine without the patch. I think rev 9631 did the changes which made the patch not compatible although Shadez updated it. I hope someone else can also test this and if it's only on Linux or also on Windows. If I didn't mention yet, I am using Ubuntu x64.

I think that explains a lot... I tried on 9708 which is at the moment I am writing this the newest patch, released 2 hours ago... Of course I changed some line numbers else I would get HUNK errors.

Thanks for the help but I still get the same errors on single and multi core, though I still think it's weird I get some error on single core which I don't get on mutli core compiles. And compile is working fine without the arena patch.

well I thought compiling on more cores worked but it doesn't. I get some weird error and thought it was TC related but it works without the arena patch. [ 86%] Building CXX object src/server/scripts/CMakeFiles/scripts.dir/__/game/AI/ScriptedAI/ScriptedSimpleAI.cpp.o Linking CXX static library libscripts.a [ 86%] Built target scripts make: *** [all] Error 2 I saw you mentioned limited support but I hope it was not your last commit ever. Anyway if you don't have time, you don't need to rush it

Thanks for the help but it still gives the same error, I don't know if the same thing happens on Windows but it's really weird that it only happens when compiling on one core. It won't be a real problem for me, I can compile on more cores...

You need to edit the patch files yourself and change the line numbers to make it compatible with the newest core revision. Edit: about my compile fail, I tested some more and it only seems to happen if I only use one of the processor cores for compiling. I seems to work if I use all cores (really weird). Anyway here is what I get when I compile with one core, btw compiling happened on Ubuntu Linux. [ 19%] Building CXX object src/server/game/CMakeFiles/game.dir/Battlegrounds/Battleground.cpp.o /home/trinity/trinitycore/src/server/game/Battlegrounds/Battleground.cpp: In member function ‘void Battleground::EndBattleground(uint32)’: /home/trinity/trinitycore/src/server/game/Battlegrounds/Battleground.cpp:750: error: type ‘class QueryResult_AutoPtr’ argument given to ‘delete’, expected pointer compilation terminated due to -Wfatal-errors. make[2]: *** [src/server/game/CMakeFiles/game.dir/Battlegrounds/Battleground.cpp.o] Error 1 make[1]: *** [src/server/game/CMakeFiles/game.dir/all] Error 2 make: *** [all] Error 2