diff --git a/system/pages/account/register.php b/system/pages/account/register.php index bfb69ee1..a10eb76f 100644 --- a/system/pages/account/register.php +++ b/system/pages/account/register.php @@ -22,6 +22,7 @@ if(isset($_POST['registeraccountsave']) && $_POST['registeraccountsave'] == "1") $account_logged->setCustomField("key", $new_rec_key); $account_logged->logAction('Generated recovery key.'); + $message = ''; if($config['mail_enabled'] && $config['send_mail_when_generate_reckey']) { @@ -54,5 +55,3 @@ if($show_form) { //show form $twig->display('account.generate_recovery_key.html.twig'); } - -?> \ No newline at end of file diff --git a/system/pages/account/register_new.php b/system/pages/account/register_new.php index dfe9749f..93a14745 100644 --- a/system/pages/account/register_new.php +++ b/system/pages/account/register_new.php @@ -40,7 +40,7 @@ else $message = '
Your recovery key were send on email address '.$account_logged->getEMail().' for '.$config['generate_new_reckey_price'].' premium points.'; } else - $message = '

An error occorred while sending email ( '.$account_logged->getEMail().' ) with recovery key! Recovery key not changed. Try again later. For Admin: More info can be found in system/logs/mailer-error.log

'; + $message = '

An error occurred while sending email ( '.$account_logged->getEMail().' ) with recovery key! Recovery key not changed. Try again later. For Admin: More info can be found in system/logs/mailer-error.log

'; $twig->display('success.html.twig', array( 'title' => 'Account Registered', diff --git a/system/pages/accountmanagement.php b/system/pages/accountmanagement.php index 53c65c0c..6364d1ff 100644 --- a/system/pages/accountmanagement.php +++ b/system/pages/accountmanagement.php @@ -59,8 +59,7 @@ $errors = array(); return; } - if($action == '') - { + if($action == '') { $freePremium = isset($config['lua']['freePremium']) && getBoolean($config['lua']['freePremium']) || $account_logged->getPremDays() == OTS_Account::GRATIS_PREMIUM_DAYS; $dayOrDays = $account_logged->getPremDays() == 1 ? 'day' : 'days'; /** @@ -72,10 +71,9 @@ $errors = array(); $account_status = '' . ($freePremium ? 'Gratis Premium Account' : 'Premium Account, ' . $account_logged->getPremDays() . ' '.$dayOrDays.' left') . ''; $recovery_key = $account_logged->getCustomField('key'); - if(empty($recovery_key)) + if(empty($recovery_key)) { $account_registered = 'No'; - else - { + } else { if($config['generate_new_reckey'] && $config['mail_enabled']) $account_registered = 'Yes ( Buy new Recovery Key )'; else diff --git a/system/pages/characters.php b/system/pages/characters.php index 5fa44c7f..84c5fd63 100644 --- a/system/pages/characters.php +++ b/system/pages/characters.php @@ -47,7 +47,7 @@ if(isset($_REQUEST['name'])) if(empty($name)) { $tmp_link = getPlayerLink($name); - echo 'Here you can get detailed information about a certain player on ' . $config['lua']['serverName'] . '.
'; + echo 'Here you can get detailed information about a certain player on ' . $config['lua']['serverName'] . '.
'; echo generate_search_form(true); return; } @@ -82,8 +82,9 @@ if($player->isLoaded() && !$player->isDeleted()) $outfit = $config['outfit_images_url'] . '?id=' . $player->getLookType() . ($db->hasColumn('players', 'lookaddons') ? '&addons=' . $player->getLookAddons() : '') . '&head=' . $player->getLookHead() . '&body=' . $player->getLookBody() . '&legs=' . $player->getLookLegs() . '&feet=' . $player->getLookFeet(); $flag = ''; - if($config['account_country']) + if($config['account_country']) { $flag = getFlagImage($account->getCountry()); + } $player_sex = 'Unknown'; if(isset($config['genders'][$player->getSex()])) @@ -147,9 +148,10 @@ if($player->isLoaded() && !$player->isDeleted()) if($config['characters']['skills']) { if($db->hasColumn('players', 'skill_fist')) {// tfs 1.0+ - $skills_db = $db->query('SELECT `skill_fist`, `skill_club`, `skill_sword`, `skill_axe`, `skill_dist`, `skill_shielding`, `skill_fishing` FROM `players` WHERE `id` = ' . $player->getId())->fetch(); + $skills_db = $db->query('SELECT `maglevel`, `skill_fist`, `skill_club`, `skill_sword`, `skill_axe`, `skill_dist`, `skill_shielding`, `skill_fishing` FROM `players` WHERE `id` = ' . $player->getId())->fetch(); $skill_ids = array( + POT::SKILL_MAGIC => 'maglevel', POT::SKILL_FIST => 'skill_fist', POT::SKILL_CLUB => 'skill_club', POT::SKILL_SWORD => 'skill_sword', @@ -175,8 +177,7 @@ if($player->isLoaded() && !$player->isDeleted()) } $quests_enabled = $config['characters']['quests'] && !empty($config['quests']); - if($quests_enabled) - { + if($quests_enabled) { $quests = $config['quests']; $sql_query_in = ''; $i = 0; @@ -197,10 +198,10 @@ if($player->isLoaded() && !$player->isDeleted()) foreach($quests as &$storage) { $storage = isset($player_storage[$storage]) && $player_storage[$storage] > 0; } + unset($storage); } - if($config['characters']['equipment']) - { + if($config['characters']['equipment']) { global $db; $eq_sql = $db->query('SELECT `pid`, `itemtype` FROM player_items WHERE player_id = '.$player->getId().' AND (`pid` >= 1 and `pid` <= 10)'); $equipment = array(); @@ -284,8 +285,7 @@ WHERE killers.death_id = '".$death['id']."' ORDER BY killers.final_hit DESC, kil $deaths[] = array('time' => $death['date'], 'description' => $description . '.'); } } - } - else { + } else { $mostdamage = ''; if($db->hasColumn('player_deaths', 'mostdamage_by')) $mostdamage = ', `mostdamage_by`, `mostdamage_is_player`, `unjustified`, `mostdamage_unjustified`'; @@ -294,8 +294,7 @@ WHERE killers.death_id = '".$death['id']."' ORDER BY killers.final_hit DESC, kil FROM `player_deaths` WHERE `player_id` = ' . $player->getId() . ' ORDER BY `time` DESC LIMIT 10;')->fetchAll(); - if(count($deaths_db)) - { + if(count($deaths_db)) { $number_of_rows = 0; foreach($deaths_db as $death) { @@ -326,14 +325,12 @@ WHERE killers.death_id = '".$death['id']."' ORDER BY killers.final_hit DESC, kil $frags = array(); $frag_add_content = ''; - if($config['characters']['frags'] && $db->hasTable('killers')) - { + if($config['characters']['frags'] && $db->hasTable('killers')) { //frags list by Xampy $i = 0; $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.';')->fetchAll(); - if(count($player_frags)) - { + if(count($player_frags)) { $row_count = 0; foreach($player_frags as $frag) { @@ -416,9 +413,7 @@ WHERE killers.death_id = '".$death['id']."' ORDER BY killers.final_hit DESC, kil 'search_form' => generate_search_form(), 'canEdit' => hasFlag(FLAG_CONTENT_PLAYERS) || superAdmin() )); -} -else -{ +} else { $search_errors[] = 'Character ' . $name . ' does not exist or has been deleted.'; $twig->display('error_box.html.twig', array('errors' => $search_errors)); $search_errors = array(); @@ -432,8 +427,7 @@ else $deleted = 'deletion'; $query = $db->query('SELECT `name`, `level`, `vocation`' . $promotion . ' FROM `players` WHERE `name` LIKE ' . $db->quote('%' . $name . '%') . ' AND ' . $deleted . ' != 1 LIMIT ' . (int)config('characters_search_limit') . ';'); - if($query->rowCount() > 0) - { + if($query->rowCount() > 0) { echo 'Did you mean: