Digitalstack/myaac
2
0
Fork 0
mirror of https://github.com/slawkens/myaac.git synced 2025-04-27 09:49:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

* fixes to the latest commit (removed some files)

Browse Source 
* otserv 0.6.3: fixed some warning (on the characters page) and fatal
mysql error (on the mango signature)
This commit is contained in:
slawkens1 2018-01-13 19:34:53 +01:00
parent 1e3aef211e
commit 67590e13a6
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
system/pages/characters.php
View File

@ -231,7 +231,7 @@ if($player->isLoaded() && !$player->isDeleted())
$dead_add_content = ''; $dead_add_content = '';
$deaths = array(); $deaths = array();
if(tableExist('killers')) { if(tableExist('killers')) {
$player_deaths = $db->query('SELECT `id`, `date`, `level` FROM `player_deaths` WHERE `player_id` = '.$player->getId().' ORDER BY `date` DESC LIMIT 0,10;'); $player_deaths = $db->query('SELECT `id`, `date`, `level` FROM `player_deaths` WHERE `player_id` = '.$player->getId().' ORDER BY `date` DESC LIMIT 0,10;')->fetchAll();
if(count($player_deaths)) if(count($player_deaths))
{ {
$number_of_rows = 0; $number_of_rows = 0;
@ -289,7 +289,7 @@ WHERE killers.death_id = '".$death['id']."' ORDER BY killers.final_hit DESC, kil
$deaths_db = $db->query('SELECT $deaths_db = $db->query('SELECT
`player_id`, `time`, `level`, `killed_by`, `is_player`' . $mostdamage . ' `player_id`, `time`, `level`, `killed_by`, `is_player`' . $mostdamage . '
FROM `player_deaths` FROM `player_deaths`
WHERE `player_id` = ' . $player->getId() . ' ORDER BY `time` DESC LIMIT 10;'); WHERE `player_id` = ' . $player->getId() . ' ORDER BY `time` DESC LIMIT 10;')->fetchAll();
if(count($deaths_db)) if(count($deaths_db))
{ {
@ -328,7 +328,7 @@ WHERE killers.death_id = '".$death['id']."' ORDER BY killers.final_hit DESC, kil
//frags list by Xampy //frags list by Xampy
$i = 0; $i = 0;
$frags_limit = 10; // frags limit to show? // default: 10 $frags_limit = 10; // frags limit to show? // default: 10
$player_frags = $db->query('SELECT `player_deaths`.*, `players`.`name`, `killers`.`unjustified` FROM `player_deaths` LEFT JOIN `killers` ON `killers`.`death_id` = `player_deaths`.`id` LEFT JOIN `player_killers` ON `player_killers`.`kill_id` = `killers`.`id` LEFT JOIN `players` ON `players`.`id` = `player_deaths`.`player_id` WHERE `player_killers`.`player_id` = '.$player->getId().' ORDER BY `date` DESC LIMIT 0,'.$frags_limit.';'); $player_frags = $db->query('SELECT `player_deaths`.*, `players`.`name`, `killers`.`unjustified` FROM `player_deaths` LEFT JOIN `killers` ON `killers`.`death_id` = `player_deaths`.`id` LEFT JOIN `player_killers` ON `player_killers`.`kill_id` = `killers`.`id` LEFT JOIN `players` ON `players`.`id` = `player_deaths`.`player_id` WHERE `player_killers`.`player_id` = '.$player->getId().' ORDER BY `date` DESC LIMIT 0,'.$frags_limit.';')->fetchAll();
if(count($player_frags)) if(count($player_frags))
{ {
$row_count = 0; $row_count = 0;

2
templates/kathrine/style.css
View File

@ -3,7 +3,7 @@
body body
{ {
background: #a7a597 url('images/background.png') no-repeat top left; background: #a7a597 url('images/background.jpg') no-repeat top left;
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
font-family: Verdana, Arial, Helvetica, sans-serif; font-family: Verdana, Arial, Helvetica, sans-serif;

2
templates/tibiacom/config.php
View File

@ -10,7 +10,7 @@ $config['boxes'] = "highscores,newcomer,gallery,networks,poll";
$config['network_facebook'] = 'tibia'; // leave empty to disable $config['network_facebook'] = 'tibia'; // leave empty to disable
$config['network_twitter'] = 'tibia'; // leave empty to disable $config['network_twitter'] = 'tibia'; // leave empty to disable
$config['background_image'] = "background-artwork-860.jpg"; $config['background_image'] = "background-artwork.jpg";
$config['logo_image'] = "tibia-logo-artwork-top.gif"; $config['logo_image'] = "tibia-logo-artwork-top.gif";
$config['gallery_image'] = 1; $config['gallery_image'] = 1;
$config['menu_categories'] = array( $config['menu_categories'] = array(

4
tools/signature/mango.php
View File

@ -31,7 +31,7 @@
$MadGD = new MadGD( SIGNATURES_BACKGROUNDS.$background ); $MadGD = new MadGD( SIGNATURES_BACKGROUNDS.$background );
$MadGD->testMode = false; $MadGD->testMode = false;
$MadGD->setDefaultStyle( SIGNATURES_FONTS.'arial.ttf', SIGNATURES_FONTS.'arialbd.ttf', 8 ); $MadGD->setDefaultStyle( SIGNATURES_FONTS.'arialbd.ttf', SIGNATURES_FONTS.'arialbd.ttf', 8 );
$MadGD->setEquipmentBackground( SIGNATURES_IMAGES.'equipments.png' ); $MadGD->setEquipmentBackground( SIGNATURES_IMAGES.'equipments.png' );
/** NAME **/ /** NAME **/
@ -67,6 +67,8 @@
$town = 'town'; $town = 'town';
if(fieldExist('town_id', 'houses')) if(fieldExist('town_id', 'houses'))
$town = 'town_id'; $town = 'town_id';
else if($db->hasColumn('houses', 'townid'))
$town = 'townid';
$house = $db->query( 'SELECT `houses`.`name`, `houses`.`' . $town . '` as town FROM `houses` WHERE `houses`.`owner` = '.$player->getId().';' )->fetchAll(); $house = $db->query( 'SELECT `houses`.`name`, `houses`.`' . $town . '` as town FROM `houses` WHERE `houses`.`owner` = '.$player->getId().';' )->fetchAll();
if ( count( $house ) != 0 ) if ( count( $house ) != 0 )