diff --git a/system/functions.php b/system/functions.php index 89d0b860..085fa57a 100644 --- a/system/functions.php +++ b/system/functions.php @@ -565,7 +565,7 @@ function getCreatureName($killer, $showStatus = false, $extendedInfo = false) if(!$showStatus) return $str.''.$player->getName().''; - $str .= '' . $player->getName() . ''; + $str .= '' . $player->getName() . ''; if($extendedInfo) { $str .= '
'.$player->getLevel().' '.$player->getVocationName().''; } @@ -684,25 +684,25 @@ function superAdmin() { * * @param int $exp Experience amount. * @param bool $color Should result be colorized? - * @return string Resulted message attached in tag. + * @return string Resulted message attached in tag. */ function formatExperience($exp, $color = true) { $ret = ''; if($color) { - $ret .= ' 0) - $ret .= ' color="green">'; - elseif($exp < 0) - $ret .= ' color="red">'; - else + $ret .= ' 0 ? 'green' : 'red') . '">'; + } + else { $ret .= '>'; + } } $ret .= '' . ($exp > 0 ? '+' : '') . number_format($exp) . ''; if($color) - $ret .= ''; + $ret .= ''; return $ret; } diff --git a/system/libs/forum.php b/system/libs/forum.php index bbda1481..7a15cacd 100644 --- a/system/libs/forum.php +++ b/system/libs/forum.php @@ -15,24 +15,24 @@ class Forum static public function canPost($account) { global $db, $config; - + if(!$account->isLoaded() || $account->isBanned()) return false; - + if(self::isModerator()) return true; - + return $db->query( 'SELECT `id` FROM `players` WHERE `account_id` = ' . $db->quote($account->getId()) . ' AND `level` >= ' . $db->quote($config['forum_level_required']) . ' LIMIT 1')->rowCount() > 0; } - + static public function isModerator() { return hasFlag(FLAG_CONTENT_FORUM) || superAdmin(); } - + static public function add_thread($title, $body, $section_id, $player_id, $account_id, &$errors) { global $db; @@ -54,10 +54,10 @@ class Forum $thread_id = $db->lastInsertId(); $db->query("UPDATE `" . TABLE_PREFIX . "forum` SET `first_post`=".(int) $thread_id." WHERE `id` = ".(int) $thread_id); } - + return $thread_id; } - + static public function add_post($thread_id, $section, $author_aid, $author_guid, $post_text, $post_topic, $smile, $html) { global $db; @@ -80,7 +80,7 @@ class Forum if(isset($name[0]) && isset($description[0])) { $query = $db->select(TABLE_PREFIX . 'forum_boards', array('name' => $name)); - + if($query === false) { $query = @@ -89,7 +89,7 @@ class Forum ' FROM ' . $db->tableName(TABLE_PREFIX . 'forum_boards') . ' ORDER BY ' . $db->fieldName('ordering') . ' DESC LIMIT 1' ); - + $ordering = 0; if($query->rowCount() > 0) { $query = $query->fetch(); @@ -102,20 +102,20 @@ class Forum } else $errors[] = 'Please fill all inputs.'; - + return !count($errors); } - + static public function get_board($id) { global $db; return $db->select(TABLE_PREFIX . 'forum_boards', array('id' => $id)); } - + static public function update_board($id, $name, $access, $guild, $description) { global $db; $db->update(TABLE_PREFIX . 'forum_boards', array('name' => $name, 'description' => $description, 'access' => $access, 'guild' => $guild), array('id' => $id)); } - + static public function delete_board($id, &$errors) { global $db; @@ -128,10 +128,10 @@ class Forum } else $errors[] = 'id not set'; - + return !count($errors); } - + static public function toggleHidden_board($id, &$errors) { global $db; @@ -145,10 +145,10 @@ class Forum } else $errors[] = 'id not set'; - + return !count($errors); } - + static public function move_board($id, $i, &$errors) { global $db; @@ -159,15 +159,15 @@ class Forum $old_record = $db->select(TABLE_PREFIX . 'forum_boards', array('ordering' => $ordering)); if($old_record !== false) $db->update(TABLE_PREFIX . 'forum_boards', array('ordering' => $query['ordering']), array('ordering' => $ordering)); - + $db->update(TABLE_PREFIX . 'forum_boards', array('ordering' => $ordering), array('id' => $id)); } else $errors[] = 'Forum board with id ' . $id . ' does not exists.'; - + return !count($errors); } - + public static function parseSmiles($text) { $smileys = array( @@ -192,13 +192,13 @@ class Forum ':d' => 9, ';)' => 10 ); - + foreach($smileys as $search => $replace) $text = str_replace($search, ''. $search .'', $text); - + return $text; } - + public static function parseBBCode($text, $smiles) { $rows = 0; @@ -221,20 +221,20 @@ class Forum $url = substr($text, stripos($text, '[url]')+5, stripos($text, '[/url]') - stripos($text, '[url]') - 5); $text = str_ireplace('[url]'.$url.'[/url]', ''.$url.'', $text); } - + $xhtml = false; $tags = array( '#\[b\](.*?)\[/b\]#si' => ($xhtml ? '\\1' : '\\1'), '#\[i\](.*?)\[/i\]#si' => ($xhtml ? '\\1' : '\\1'), '#\[u\](.*?)\[/u\]#si' => ($xhtml ? '\\1' : '\\1'), '#\[s\](.*?)\[/s\]#si' => ($xhtml ? '\\1' : '\\1'), - + '#\[guild\](.*?)\[/guild\]#si' => urldecode(generateLink(getGuildLink('$1', false), '$1', true)), '#\[house\](.*?)\[/house\]#si' => urldecode(generateLink(getHouseLink('$1', false), '$1', true)), '#\[player\](.*?)\[/player\]#si' => urldecode(generateLink(getPlayerLink('$1', false), '$1', true)), // TODO: [poll] tag - - '#\[color=(.*?)\](.*?)\[/color\]#si' => ($xhtml ? '\\2' : '\\2'), + + '#\[color=(.*?)\](.*?)\[/color\]#si' => ($xhtml ? '\\2' : '\\2'), '#\[img\](.*?)\[/img\]#si' => ($xhtml ? '' : ''), '#\[url=(.*?)\](.*?)\[/url\]#si' => '\\2', // '#\[email\](.*?)\[/email\]#si' => '\\1', @@ -242,13 +242,13 @@ class Forum // '#\[align=(.*?)\](.*?)\[/align\]#si' => ($xhtml ? '
\\2
' : '
\\2
'), // '#\[br\]#si' => ($xhtml ? '
' : '
'), ); - + foreach($tags as $search => $replace) $text = preg_replace($search, $replace, $text); - + return ($smiles ? Forum::parseSmiles($text) : $text); } - + public static function showPost($topic, $text, $smiles = true, $html = false) { if($html) { @@ -262,12 +262,12 @@ class Forum $post .= self::parseBBCode(nl2br($text), $smiles); return $post; } - + public static function hasAccess($board_id) { global $sections, $logged, $account_logged, $logged_access; if(!isset($sections[$board_id])) return false; - + $hasAccess = true; $section = $sections[$board_id]; if($section['guild'] > 0) { @@ -283,20 +283,20 @@ class Forum } } } - + if (!$status) $hasAccess = false; } else { $hasAccess = false; } } - + if($section['access'] > 0) { if($logged_access < $section['access']) { $hasAccess = false; } } - + return $hasAccess; } } diff --git a/system/locale/de/install.php b/system/locale/de/install.php index 4a88042f..4ed93d20 100644 --- a/system/locale/de/install.php +++ b/system/locale/de/install.php @@ -111,6 +111,6 @@ $locale['step_finish_homepage'] = 'Startseite'; $locale['step_finish'] = 'Fertig'; $locale['step_finish_title'] = 'Installation beendet!'; $locale['step_finish_desc'] = 'Herzlichen Glückwunsch! MyAAC ist bereit zu verwenden!
Sie können sich jetzt im $ADMIN_PANEL$ anmelden, oder die $HOMEPAGE$ besuchen.

-Bitte lösche install/ Verzeichnis.

+Bitte lösche install/ Verzeichnis.

Bitte senden Sie Fehler und Vorschläge zu $LINK$, Vielen Dank!'; ?> diff --git a/system/locale/en/install.php b/system/locale/en/install.php index 13410415..c53bfa77 100644 --- a/system/locale/en/install.php +++ b/system/locale/en/install.php @@ -111,6 +111,6 @@ $locale['step_finish_homepage'] = 'homepage'; $locale['step_finish'] = 'Finish'; $locale['step_finish_title'] = 'Installation finished!'; $locale['step_finish_desc'] = 'Congratulations! MyAAC is ready to use!
You can now login to $ADMIN_PANEL$, or visit $HOMEPAGE$.

-Please delete install/ directory.

+Please delete install/ directory.

Post bugs and suggestions at $LINK$, thanks!'; ?> diff --git a/system/locale/pl/install.php b/system/locale/pl/install.php index 6fdae6dd..a6957ec7 100644 --- a/system/locale/pl/install.php +++ b/system/locale/pl/install.php @@ -106,6 +106,6 @@ $locale['step_finish_homepage'] = 'stronę główną'; $locale['step_finish'] = 'Koniec'; $locale['step_finish_title'] = 'Instalacja zakończona!'; $locale['step_finish_desc'] = 'Gratulacje! MyAAC jest gotowy do użycia!
Możesz się teraz zalogować do $ADMIN_PANEL$, albo odwiedzić $HOMEPAGE$.

-Proszę usunąć katalog install/.

+Proszę usunąć katalog install/.

Wrzuć błędy i sugestie na $LINK$, dzięki!'; ?> diff --git a/system/locale/sv/install.php b/system/locale/sv/install.php index a0c7b911..1ed17d49 100644 --- a/system/locale/sv/install.php +++ b/system/locale/sv/install.php @@ -88,6 +88,6 @@ $locale['step_finish_homepage'] = 'hemsida'; $locale['step_finish'] = 'Klar'; $locale['step_finish_title'] = 'Installationen klar!'; $locale['step_finish_desc'] = 'Grattis! MyAAC är redo att användas!
Du kan logga in på $ADMIN_PANEL$, eller titta till $HOMEPAGE$.

-Var vänligen ta bort installations mappen.

+Var vänligen ta bort installations mappen.

Var vänligen rapportera buggar och förslag på $LINK$, tack!'; ?> diff --git a/system/pages/account/register.php b/system/pages/account/register.php index 56d8918d..5b168d39 100644 --- a/system/pages/account/register.php +++ b/system/pages/account/register.php @@ -35,7 +35,7 @@ if(isset($_POST['registeraccountsave']) && $_POST['registeraccountsave'] == "1") } $twig->display('success.html.twig', array( 'title' => 'Account Registered', - 'description' => 'Thank you for registering your account! You can now recover your account if you have lost access to the assigned email address by using the following

   Recovery Key: '.$new_rec_key.'


Important:' + 'description' => 'Thank you for registering your account! You can now recover your account if you have lost access to the assigned email address by using the following

   Recovery Key: '.$new_rec_key.'


Important:' )); } else diff --git a/system/pages/accountmanagement.php b/system/pages/accountmanagement.php index b38d8d1c..88386642 100644 --- a/system/pages/accountmanagement.php +++ b/system/pages/accountmanagement.php @@ -63,18 +63,18 @@ $errors = array(); $freePremium = isset($config['lua']['freePremium']) && getBoolean($config['lua']['freePremium']); $recovery_key = $account_logged->getCustomField('key'); if(!$account_logged->isPremium()) - $account_status = 'Free Account'; + $account_status = 'Free Account'; else - $account_status = 'Premium Account, ' . ($freePremium ? 'Unlimited' : $account_logged->getPremDays() . ' days left') . ''; + $account_status = 'Premium Account, ' . ($freePremium ? 'Unlimited' : $account_logged->getPremDays() . ' days left') . ''; if(empty($recovery_key)) - $account_registered = 'No'; + $account_registered = 'No'; else { if($config['generate_new_reckey'] && $config['mail_enabled']) - $account_registered = 'Yes ( Buy new Recovery Key )'; + $account_registered = 'Yes ( Buy new Recovery Key )'; else - $account_registered = 'Yes'; + $account_registered = 'Yes'; } $account_created = $account_logged->getCreated(); @@ -86,9 +86,9 @@ $errors = array(); $account_location = $account_logged->getLocation(); if($account_logged->isBanned()) if($account_logged->getBanTime() > 0) - $welcome_message = 'Your account is banished until '.date("j F Y, G:i:s", $account_logged->getBanTime()).'!'; + $welcome_message = 'Your account is banished until '.date("j F Y, G:i:s", $account_logged->getBanTime()).'!'; else - $welcome_message = 'Your account is banished FOREVER!'; + $welcome_message = 'Your account is banished FOREVER!'; else $welcome_message = 'Welcome to your account!'; diff --git a/system/pages/bans.php b/system/pages/bans.php index b6179777..a7a1f4b0 100644 --- a/system/pages/bans.php +++ b/system/pages/bans.php @@ -37,12 +37,12 @@ if(!$bans->rowCount()) ?> - - - - - - + + + + + + "[MAP]", "[WEBSITE]", "[CLIENT]", "[MONSTER]", "[NPC]", "[OTHER]"); - + if(admin() and isset($_REQUEST['control']) && $_REQUEST['control'] == "true") { if(empty($_REQUEST['id']) and empty($_REQUEST['acc']) or !is_numeric($_REQUEST['acc']) or !is_numeric($_REQUEST['id']) ) $bug[1] = $db->query('SELECT * FROM '.$db->tableName(TABLE_PREFIX . 'bugtracker').' where `type` = 1 order by `uid` desc'); - + if(!empty($_REQUEST['id']) and is_numeric($_REQUEST['id']) and !empty($_REQUEST['acc']) and is_numeric($_REQUEST['acc'])) $bug[2] = $db->query('SELECT * FROM '.$db->tableName(TABLE_PREFIX . 'bugtracker').' where `account` = '.$_REQUEST['acc'].' and `id` = '.$_REQUEST['id'].' and `type` = 1')->fetch(); - + if(!empty($_REQUEST['id']) and is_numeric($_REQUEST['id']) and !empty($_REQUEST['acc']) and is_numeric($_REQUEST['acc'])) { if(!empty($_REQUEST['reply'])) $reply=true; - + $account = new OTS_Account(); $account->load($_REQUEST['acc']); $account->isLoaded(); $players = $account->getPlayersList(); - + if(!$reply) { if($bug[2]['status'] == 2) - $value = "[OPEN]"; + $value = '[OPEN]'; elseif($bug[2]['status'] == 3) - $value = "[CLOSED]"; + $value = '[CLOSED]'; elseif($bug[2]['status'] == 1) - $value = "[NEW ANSWER]"; - - echo '
NickTypeExpiresReasonCommentAdded by:NickTypeExpiresReasonCommentAdded by:
'; - echo ''; - echo ''; } diff --git a/system/pages/highscores.php b/system/pages/highscores.php index e6f91d27..fdbdd43a 100644 --- a/system/pages/highscores.php +++ b/system/pages/highscores.php @@ -230,7 +230,7 @@ echo ' echo '
Bug Tracker
Subject'.$tags[$bug[2]['tag']].' '.$bug[2]['subject'].' '.$value.'
Posted by'; - + $value = '[NEW ANSWER]'; + + echo ''; + echo ''; + echo ''; - echo ''; - echo ''; + echo ''; + echo ''; echo '
Bug Tracker
Subject'.$tags[$bug[2]['tag']].' '.$bug[2]['subject'].' '.$value.'
Posted by'; + foreach($players as $player) { echo ''.$player->getName().'
'; } - + echo '
Description
'.nl2br($bug[2]['text']).'
Description
'.nl2br($bug[2]['text']).'
'; - + $answers = $db->query('SELECT * FROM '.$db->tableName(TABLE_PREFIX . 'bugtracker').' where `account` = '.$_REQUEST['acc'].' and `id` = '.$_REQUEST['id'].' and `type` = 2 order by `reply`'); foreach($answers as $answer) { if($answer['who'] == 1) - $who = "[ADMIN]"; + $who = '[ADMIN]'; else - $who = "[PLAYER]"; - - echo '
'; - echo ''; - echo ''; - echo ''; + $who = '[PLAYER]'; + + echo '
Answer #'.$answer['reply'].'
Posted by'.$who.'
Description
'.nl2br($answer['text']).'
'; + echo ''; + echo ''; + echo ''; echo '
Answer #'.$answer['reply'].'
Posted by'.$who.'
Description
'.nl2br($answer['text']).'
'; } if($bug[2]['status'] != 3) @@ -95,12 +95,12 @@ $showed = $post = $reply = false; if(isset($_POST['finish'])) { if(empty($_POST['text'])) - $error[] = "Description cannot be empty."; + $error[] = 'Description cannot be empty.'; if($iswho['who'] == 1) - $error[] = "You must wait for User answer."; + $error[] = 'You must wait for User answer.'; if(empty($_POST['status'])) - $error[] = "Status cannot be empty."; - + $error[] = 'Status cannot be empty.'; + if(!empty($error)) { foreach($error as $errors) @@ -118,27 +118,27 @@ $showed = $post = $reply = false; } else { - echo "
You can't add answer to closed bug thread."; + echo '
You can\'t add answer to closed bug thread.'; } } - + $post=true; } if(!$post) { - echo ''; + echo '
Bug Tracker Admin
'; $i=1; foreach($bug[1] as $report) { if($report['status'] == 2) - $value = "[OPEN]"; + $value = '[OPEN]'; elseif($report['status'] == 3) - $value = "[CLOSED]"; + $value = '[CLOSED]'; elseif($report['status'] == 1) - $value = "[NEW ANSWER]"; - + $value = '[NEW ANSWER]'; + echo ''; - + $showed=true; $i++; } @@ -146,58 +146,58 @@ $showed = $post = $reply = false; } } else - { + { $acc = $account_logged->getId(); $account_players = $account_logged->getPlayersList(); - + foreach($account_players as $player) { $allow=true; } - + if(!empty($_REQUEST['id'])) $id = addslashes(htmlspecialchars(trim($_REQUEST['id']))); - + if(empty($_REQUEST['id'])) $bug[1] = $db->query('SELECT * FROM '.$db->tableName(TABLE_PREFIX . 'bugtracker').' where `account` = '.$account_logged->getId().' and `type` = 1 order by `id` desc'); - + if(!empty($_REQUEST['id']) and is_numeric($_REQUEST['id'])) $bug[2] = $db->query('SELECT * FROM '.$db->tableName(TABLE_PREFIX . 'bugtracker').' where `account` = '.$account_logged->getId().' and `id` = '.$id.' and `type` = 1')->fetch(); else $bug[2] = NULL; - + if(!empty($_REQUEST['id']) and $bug[2] != NULL) { if(!empty($_REQUEST['reply'])) $reply=true; - + if(!$reply) { if($bug[2]['status'] == 1) - $value = "[OPEN]"; + $value = '[OPEN]'; elseif($bug[2]['status'] == 2) - $value = "[NEW ANSWER]"; + $value = '[NEW ANSWER]'; elseif($bug[2]['status'] == 3) - $value = "[CLOSED]"; - - echo '
Bug Tracker Admin
'.$tags[$report['tag']].' '.$report['subject'].''.$value.'
'; - echo ''; - echo ''; - echo ''; + $value = '[CLOSED]'; + + echo '
Bug Tracker
Subject'.$tags[$bug[2]['tag']].' '.$bug[2]['subject'].' '.$value.'
Description
'.nl2br($bug[2]['text']).'
'; + echo ''; + echo ''; + echo ''; echo '
Bug Tracker
Subject'.$tags[$bug[2]['tag']].' '.$bug[2]['subject'].' '.$value.'
Description
'.nl2br($bug[2]['text']).'
'; - + $answers = $db->query('SELECT * FROM '.$db->tableName('myaac_bugtracker').' where `account` = '.$account_logged->getId().' and `id` = '.$id.' and `type` = 2 order by `reply`'); foreach($answers as $answer) { if($answer['who'] == 1) - $who = "[ADMIN]"; + $who = '[ADMIN]'; else - $who = "[YOU]"; - - echo '
'; - echo ''; - echo ''; - echo ''; + $who = '[YOU]'; + + echo '
Answer #'.$answer['reply'].'
Posted by'.$who.'
Description
'.nl2br($answer['text']).'
'; + echo ''; + echo ''; + echo ''; echo '
Answer #'.$answer['reply'].'
Posted by'.$who.'
Description
'.nl2br($answer['text']).'
'; } if($bug[2]['status'] != 3) @@ -214,12 +214,12 @@ $showed = $post = $reply = false; if(isset($_POST['finish'])) { if(empty($_POST['text'])) - $error[] = "Description cannot be empty."; + $error[] = 'Description cannot be empty.'; if($iswho['who'] == 0) - $error[] = "You must wait for Administrator answer."; + $error[] = 'You must wait for Administrator answer.'; if(!$allow) - $error[] = "You haven't any characters on account."; - + $error[] = 'You haven\'t any characters on account.'; + if(!empty($error)) { foreach($error as $errors) @@ -237,34 +237,34 @@ $showed = $post = $reply = false; } else { - echo "
You can't add answer to closed bug thread."; + echo '
You can\'t add answer to closed bug thread.'; } } - + $post=true; } elseif(!empty($_REQUEST['id']) and $bug[2] == NULL) { - echo ''; - echo ''; + echo '
Bug Tracker
Bug doesn\'t exist.
'; + echo ''; echo '
Bug Tracker
Bug doesn\'t exist.
'; $post=true; } - + if(!$post) { if(!isset($_REQUEST['add']) || $_REQUEST['add'] != TRUE) { - echo ''; + echo '
Bug Tracker
'; foreach($bug[1] as $report) { if($report['status'] == 1) - $value = "[OPEN]"; + $value = '[OPEN]'; elseif($report['status'] == 2) - $value = "[NEW ANSWER]"; + $value = '[NEW ANSWER]'; elseif($report['status'] == 3) - $value = "[CLOSED]"; - + $value = '[CLOSED]'; + if(is_int($report['id'] / 2)) { $bgcolor = $dark; @@ -275,16 +275,16 @@ $showed = $post = $reply = false; } echo ''; - + $showed=true; } - + if(!$showed) { - echo ''; + echo ''; } echo '
Bug Tracker
'.$tags[$report['tag']].' '.$report['subject'].''.$value.'
You don\'t have reported any bugs.
You don\'t have reported any bugs.
'; - + echo '
[ADD REPORT]'; } elseif(isset($_REQUEST['add']) && $_REQUEST['add'] == TRUE) @@ -292,23 +292,23 @@ $showed = $post = $reply = false; $thread = $db->query('SELECT * FROM `' . TABLE_PREFIX . 'bugtracker` where `account` = '.$acc.' and `type` = 1 order by `id` desc')->fetch(); $id_next = $db->query('SELECT MAX(id) FROM `' . TABLE_PREFIX . 'bugtracker` where `account` = '.$acc.' and `type` = 1')->fetch(); $id_next = $id_next[0] + 1; - + if(empty($thread)) $thread['status'] = 3; - + if(isset($_POST['submit'])) { if($thread['status'] != 3) - $error[] = "Can be only 1 open bug thread."; + $error[] = 'Can be only 1 open bug thread.'; if(empty($_POST['subject'])) - $error[] = "Subject cannot be empty."; + $error[] = 'Subject cannot be empty.'; if(empty($_POST['text'])) - $error[] = "Description cannot be empty."; + $error[] = 'Description cannot be empty.'; if(!$allow) - $error[] = "You haven't any characters on account."; + $error[] = 'You haven\'t any characters on account.'; if(empty($_POST['tags'])) - $error[] = "Tag cannot be empty."; - + $error[] = 'Tag cannot be empty.'; + if(!empty($error)) { foreach($error as $errors) @@ -321,22 +321,22 @@ $showed = $post = $reply = false; $INSERT = $db->query('INSERT INTO `' . TABLE_PREFIX . 'bugtracker` (`account`,`id`,`text`,`type`,`subject`, `reply`,`status`,`tag`) VALUES ('.$db->quote($acc).','.$db->quote($id_next).','.$db->quote($_POST['text']).','.$db->quote($type).','.$db->quote($_POST['subject']).', 0,'.$db->quote($status).','.$db->quote($_POST['tags']).')'); header('Location: ?subtopic=bugtracker&id='.$id_next.''); } - + } echo '
Subject
Description
TAG

'; } } } - + if(admin() and empty($_REQUEST['control'])) { echo '

[ADMIN PANEL]'; } -?> +?> diff --git a/system/pages/characters.php b/system/pages/characters.php index 70e46bdf..36f4ce71 100644 --- a/system/pages/characters.php +++ b/system/pages/characters.php @@ -302,7 +302,7 @@ WHERE killers.death_id = '".$death['id']."' ORDER BY killers.final_hit DESC, kil $lasthit = ($death['is_player']) ? getPlayerLink($death['killed_by']) : $death['killed_by']; $description = 'Killed at level ' . $death['level'] . ' by ' . $lasthit; if($death['unjustified']) { - $description .= " (unjustified)"; + $description .= ' (unjustified)'; } $mostdmg = ($death['mostdamage_by'] !== $death['killed_by']) ? true : false; @@ -312,7 +312,7 @@ WHERE killers.death_id = '".$death['id']."' ORDER BY killers.final_hit DESC, kil $description .= ' and by ' . $mostdmg; if ($death['mostdamage_unjustified']) { - $description .= " (unjustified)"; + $description .= ' (unjustified)'; } } else { diff --git a/system/pages/creatures.php b/system/pages/creatures.php index 927d1a34..3576187c 100644 --- a/system/pages/creatures.php +++ b/system/pages/creatures.php @@ -78,34 +78,34 @@ if(empty($_REQUEST['creature'])) $monsters = $db->query('SELECT * FROM `' . TABLE_PREFIX . 'monsters` WHERE `hidden` != 1'.$whereandorder); echo ''; if($order == 'name' && !isset($_REQUEST['desc'])) { - echo ''; + echo ''; } else { - echo ''; + echo ''; } if($order == 'health' && !isset($_REQUEST['desc'])) { - echo ''; + echo ''; } else { - echo ''; + echo ''; } if($order == 'exp' && !isset($_REQUEST['desc'])) { - echo ''; + echo ''; } else { - echo ''; + echo ''; } if($order == 'summonable' && !isset($_REQUEST['desc'])) { - echo ''; + echo ''; } else { - echo ''; + echo ''; } if($order == 'convinceable' && !isset($_REQUEST['desc'])) { - echo ''; + echo ''; } else { - echo ''; + echo ''; } if($order == 'race' && !isset($_REQUEST['desc'])) { - echo ''; + echo ''; } else { - echo ''; + echo ''; } $number_of_rows = 0; foreach($monsters as $monster) { diff --git a/system/pages/forum/show_board.php b/system/pages/forum/show_board.php index 381dfdfc..bc7101e6 100644 --- a/system/pages/forum/show_board.php +++ b/system/pages/forum/show_board.php @@ -43,8 +43,8 @@ echo '

Page: '.$links_to_pages.'
'; $last_threads = $db->query("SELECT `players`.`id` as `player_id`, `players`.`name`, `" . TABLE_PREFIX . "forum`.`post_text`, `" . TABLE_PREFIX . "forum`.`post_topic`, `" . TABLE_PREFIX . "forum`.`id`, `" . TABLE_PREFIX . "forum`.`last_post`, `" . TABLE_PREFIX . "forum`.`replies`, `" . TABLE_PREFIX . "forum`.`views`, `" . TABLE_PREFIX . "forum`.`post_date` FROM `players`, `" . TABLE_PREFIX . "forum` WHERE `players`.`id` = `" . TABLE_PREFIX . "forum`.`author_guid` AND `" . TABLE_PREFIX . "forum`.`section` = ".(int) $section_id." AND `" . TABLE_PREFIX . "forum`.`first_post` = `" . TABLE_PREFIX . "forum`.`id` ORDER BY `" . TABLE_PREFIX . "forum`.`last_post` DESC LIMIT ".$config['forum_threads_per_page']." OFFSET ".($_page * $config['forum_threads_per_page']))->fetchAll(); if(isset($last_threads[0])) { - echo '
Name DESCName DESCNameNameHealth
DESC		Health
DESC		HealthHealthExperience
DESC		Experience
DESC		ExperienceExperienceSummonable
Mana DESC		Summonable
Mana DESC		Summonable
Mana		Summonable
Mana		Convinceable
Mana DESC		Convinceable
Mana DESC		Convinceable
Mana		Convinceable
Mana		Race
DESC
Race
DESC
Race
Race
'; - + echo '
ThreadThread StarterRepliesViewsLast Post
'; + $player = new OTS_Player(); foreach($last_threads as $thread) { @@ -52,18 +52,18 @@ if(isset($last_threads[0])) if(Forum::isModerator()) { echo '[MOVE]'; - echo '[REMOVE] '; + echo '[REMOVE] '; } - + $player->load($thread['player_id']); if(!$player->isLoaded()) { error('Forum error: Player not loaded.'); die(); } - + $player_account = $player->getAccount(); $canEditForum = $player_account->hasFlag(FLAG_CONTENT_FORUM) || $player_account->isAdmin(); - + echo ''.($canEditForum ? $thread['post_topic'] : htmlspecialchars($thread['post_topic'])) . '
'.($canEditForum ? substr(strip_tags($thread['post_text']), 0, 50) : htmlspecialchars(substr($thread['post_text'], 0, 50))).'...'; + echo ''; } echo '
ThreadThread StarterRepliesViewsLast Post
' . getPlayerLink($thread['name']) . ''.(int) $thread['replies'].''.(int) $thread['views'].''; if($thread['last_post'] > 0) { diff --git a/system/pages/guilds/show.php b/system/pages/guilds/show.php index 10cec30f..aeb026ee 100644 --- a/system/pages/guilds/show.php +++ b/system/pages/guilds/show.php @@ -154,9 +154,9 @@ else if($level_in_guild > $rank->getLevel() || $guild_leader) if($guild_leader_char->getName() != $player->getName()) - echo ' {KICK}'; + echo ' {KICK}'; - echo ''.$player->getLevel().'Online' : 'red">Offline').'
'.$player->getLevel().'Online' : 'red">Offline').'
- ' . $player['name'] . ' + ' . $player['name'] . ' '; if($config['highscores_vocation']) { if(isset($player['promotion'])) { diff --git a/system/pages/lostaccount.php b/system/pages/lostaccount.php index 07a8f7b4..58b168ba 100644 --- a/system/pages/lostaccount.php +++ b/system/pages/lostaccount.php @@ -441,7 +441,7 @@ elseif($action == 'checkcode') $error = 'Account of this character or this character doesn\'t exist.'; } if(!empty($error)) - echo ''.$error.'
Please enter code from e-mail and name of one character from account. Then press Submit.
+ echo ''.$error.'
Please enter code from e-mail and name of one character from account. Then press Submit.
@@ -462,7 +462,7 @@ elseif($action == 'setnewpassword') $character = stripslashes($_REQUEST['character']); echo ''; if(empty($code) || empty($character) || empty($newpassword)) - echo 'Error. Try again.
Please enter code from e-mail and name of one character from account. Then press Submit.
+ echo 'Error. Try again.
Please enter code from e-mail and name of one character from account. Then press Submit.

Code & character name
- + {% endfor %}
@@ -533,7 +533,7 @@ elseif($action == 'setnewpassword') $error = 'Account of this character or this character doesn\'t exist.'; } if(!empty($error)) - echo ''.$error.'
Please enter code from e-mail and name of one character from account. Then press Submit.
+ echo ''.$error.'
Please enter code from e-mail and name of one character from account. Then press Submit.
diff --git a/system/pages/polls.php b/system/pages/polls.php index 14e3dc89..995563d1 100644 --- a/system/pages/polls.php +++ b/system/pages/polls.php @@ -231,7 +231,7 @@ function getColorByPercent($percent) - + '; $i++; } @@ -270,7 +270,7 @@ function getColorByPercent($percent) - + '; $i++; } @@ -282,7 +282,7 @@ function getColorByPercent($percent) } $showed=true; - echo '
Go to list of polls'; + echo '
Go to list of polls'; } } } @@ -300,7 +300,7 @@ function getColorByPercent($percent) if(isset($_POST['submit'])) { setSession('answers', $_POST['answers']); - echo 'Adding Poll

+ echo 'Adding Poll

Question
Description
Time to end, in days
'; @@ -351,22 +351,22 @@ function getColorByPercent($percent) { if(!$check) { - echo 'Adding Poll

+ echo 'Adding Poll

Number of Answers


'; } else { - echo '
Cannot be two and more active polls.

'; + echo '
Cannot be two and more active polls.

'; } } $showed=true; - echo '
Go to list of polls'; + echo '
Go to list of polls'; } if(!$showed) { echo 'This poll doesn\'t exist.
'; - echo '
Go to list of polls'; + echo '
Go to list of polls'; } ?> diff --git a/system/pages/team.php b/system/pages/team.php index 7cdb382f..e06d84a9 100644 --- a/system/pages/team.php +++ b/system/pages/team.php @@ -58,10 +58,10 @@ foreach($groupList as $id => $group) $tmp .= ''; if($config['team_display_status']) - $tmp .= ''; + $tmp .= ''; if($config['multiworld'] || $config['team_display_world']) - $tmp .= ''; + $tmp .= ''; $lastLogin = ''; if($config['team_display_lastlogin']) @@ -107,18 +107,18 @@ function getGroupHeader($groupField = true) $ret = ''; if($groupField) - $ret .= ''; + $ret .= ''; - $ret .= ''; + $ret .= ''; if($config['team_display_status']) - $ret .= ''; + $ret .= ''; if($config['multiworld'] || $config['team_display_world']) - $ret .= ''; + $ret .= ''; if($config['team_display_lastlogin']) - $ret .= ''; + $ret .= ''; $ret .= ''; return $ret; diff --git a/system/templates/account.change_name.html.twig b/system/templates/account.change_name.html.twig index df6f9643..2438ae2f 100644 --- a/system/templates/account.change_name.html.twig +++ b/system/templates/account.change_name.html.twig @@ -1,5 +1,5 @@ To change a name of character select player and choose a new name.
-Change name cost {{ config.account_change_character_name_points }} premium points. You have {{ points }} premium points.

+Change name cost {{ config.account_change_character_name_points }} premium points. You have {{ points }} premium points.

@@ -37,9 +37,9 @@ To change a name of character select player and choose a new name.

- +
Please enter your character name.
- +
Code & character name
' . slaw_getPercentBar($percent[$i]) . ' ' . $answer['votes'] . '(' . $percent[$i] . '%)' . $answer['votes'] . '(' . $percent[$i] . '%)
' . slaw_getPercentBar($percent[$i]) . ' ' . $answer['votes'] . '(' . $percent[$i] . '%)' . $answer['votes'] . '(' . $percent[$i] . '%)
' . $flag . ' ' . getPlayerLink($member->getName()) . '' . ($member->isOnline() > 0 ? 'Online' : 'Offline') . '' . ($member->isOnline() > 0 ? 'Online' : 'Offline') . '' . getWorldName($member->getWorldId()) . '' . getWorldName($member->getWorldId()) . '
GroupGroupNameNameStatusStatusWorldWorldLast loginLast login
diff --git a/system/templates/account.change_sex.html.twig b/system/templates/account.change_sex.html.twig index c57725ca..07ea83e9 100644 --- a/system/templates/account.change_sex.html.twig +++ b/system/templates/account.change_sex.html.twig @@ -1,5 +1,5 @@ To change a sex of character select player and choose a new sex.
-Change sex cost {{ config.account_change_character_sex_points }} premium points. You have {{ points }} premium points.

+Change sex cost {{ config.account_change_character_sex_points }} premium points. You have {{ points }} premium points.

diff --git a/system/templates/account.create_character.html.twig b/system/templates/account.create_character.html.twig index ae11b47d..af0ecb0a 100644 --- a/system/templates/account.create_character.html.twig +++ b/system/templates/account.create_character.html.twig @@ -3,7 +3,7 @@ Please choose a name{% if config.character_samples|length > 1 %}, vocation{% end and sex for your character.
In any case the name must not violate the naming conventions stated in the {{ config.lua.serverName }} Rules, or your character might get deleted or name locked. {% if account_logged.getPlayersList()|length >= config.characters_per_account %} - You have maximum number of characters per account on your account. Delete one before you make new. + You have maximum number of characters per account on your account. Delete one before you make new. {% endif %}

@@ -48,9 +48,9 @@ In any case the name must not violate the naming conventions stated in the
- +
{% if not save or errors.name is defined %}Please enter your character name.{% endif %}
- +
{% set i = 0 %} diff --git a/system/templates/account.generate_new_recovery_key.html.twig b/system/templates/account.generate_new_recovery_key.html.twig index 5723ffb4..f1ec611b 100644 --- a/system/templates/account.generate_new_recovery_key.html.twig +++ b/system/templates/account.generate_new_recovery_key.html.twig @@ -1,5 +1,5 @@ To generate new recovery key for your account please enter your password.
-New recovery key cost {{ config.generate_new_reckey_price }} Premium Points. You have {{ points }} premium points. You will receive e-mail with this recovery key.
+New recovery key cost {{ config.generate_new_reckey_price }} Premium Points. You have {{ points }} premium points. You will receive e-mail with this recovery key.
diff --git a/system/templates/account.management.html.twig b/system/templates/account.management.html.twig index 279e0901..b8e9aae0 100644 --- a/system/templates/account.management.html.twig +++ b/system/templates/account.management.html.twig @@ -168,7 +168,7 @@ {% for player in players %} {% set i = i + 1 %}
{{ player.getName() }}{{ player.getLevel() }}{{ player.getVocationName() }}{{ config.towns[player.getTownId()] }}{% if player.getLastLogin() > 0 %}{{ player.getLastLogin|date('d F Y (H:i)') }}{% else %}Never.{% endif %}{% if player.isOnline() %}ONLINE{% else %}Offline{% endif %}{% if player.isHidden() %}Hidden{% else %}Visible{% endif %}[Edit]{{ player.getName() }}{{ player.getLevel() }}{{ player.getVocationName() }}{{ config.towns[player.getTownId()] }}{% if player.getLastLogin() > 0 %}{{ player.getLastLogin|date('d F Y (H:i)') }}{% else %}Never.{% endif %}{% if player.isOnline() %}ONLINE{% else %}Offline{% endif %}{% if player.isHidden() %}Hidden{% else %}Visible{% endif %}[Edit]
diff --git a/system/templates/changelog.html.twig b/system/templates/changelog.html.twig index cc8a516f..8ba6c627 100644 --- a/system/templates/changelog.html.twig +++ b/system/templates/changelog.html.twig @@ -1,10 +1,10 @@
- - - - + + + + {% if changelogs|length > 0%} {% set i = 0 %} @@ -26,7 +26,7 @@ {% endif %} - +
TypeWhereDateDescriptionTypeWhereDateDescription
There are no changelogs for the moment.
{% if page > 0 %} diff --git a/system/templates/characters.html.twig b/system/templates/characters.html.twig index 5d39e139..0df1cf9c 100644 --- a/system/templates/characters.html.twig +++ b/system/templates/characters.html.twig @@ -27,7 +27,7 @@ {% set rows = rows + 1 %} - + {% set rows = rows + 1 %} @@ -263,7 +263,7 @@ {% for frag in frags %} - + {% set i = i + 1 %} {% endfor %} @@ -357,7 +357,7 @@ - +
Previous Page
Name:{{ flag|raw }} {{ player.getName() }}{{ oldName }}{{ flag|raw }} {{ player.getName() }}{{ oldName }}
{{ frag.time|date("j M Y, H:i") }}{{ frag.description|raw }}({% if frag.unjustified %}Unjustified{% else %}Justified{% endif %}){{ frag.description|raw }}({% if frag.unjustified %}Unjustified{% else %}Justified{% endif %})
Created: {{ account.getCreated()|date("j F Y, g:i a") }} {% if bannedUntil matches '/^\\d+$/' or bannedUntil == '-1' %} - [Banished {% if bannedUntil == '-1' %}forever{% else %}until {{ bannedUntil|date('d F Y, h:s') }}{% endif %}] + [Banished {% if bannedUntil == '-1' %}forever{% else %}until {{ bannedUntil|date('d F Y, h:s') }}{% endif %}] {% else %} {{ bannedUntil|raw }} {% endif %} @@ -384,11 +384,11 @@ {% set i = i + 1 %}
- {{ i }}. {{ player.getName() }}{% if player.isDeleted() %} [DELETED]{% endif %} + {{ i }}. {{ player.getName() }}{% if player.isDeleted() %} [DELETED]{% endif %} {{ player.getLevel() }} {{ player.getVocationName() }}{% if player.isOnline() %}Online{% endif %}{% if player.isOnline() %}Online{% endif %} diff --git a/system/templates/forum.boards.html.twig b/system/templates/forum.boards.html.twig index 532918b0..51198f6b 100644 --- a/system/templates/forum.boards.html.twig +++ b/system/templates/forum.boards.html.twig @@ -2,20 +2,20 @@
{% if canEdit %} {% endif %} diff --git a/system/templates/forum.edit_post.html.twig b/system/templates/forum.edit_post.html.twig index a150cf76..cd1e2a51 100644 --- a/system/templates/forum.edit_post.html.twig +++ b/system/templates/forum.edit_post.html.twig @@ -6,7 +6,7 @@
- Board + Board - Posts + Posts - Threads + Threads - Last Post + Last Post - Options + Options
@@ -25,7 +25,7 @@ - diff --git a/system/templates/guilds.manager.html.twig b/system/templates/guilds.manager.html.twig index 5fd98db6..b19efcf7 100644 --- a/system/templates/guilds.manager.html.twig +++ b/system/templates/guilds.manager.html.twig @@ -4,10 +4,10 @@ Here you can change names of ranks, delete and add ranks, pass leadership to oth
- Edit Post + Edit Post
(Optional)
Message:
You can use:
[player]Nick[/player]
[url]http://address.com/[/url]
[img]http://images.com/images3.gif[/img]
[code]Code[/code]
[b]Text[/b]
[i]Text[/i]
[u]Text[/u]
and smileys:
;) , :) , :D , :( , :rolleyes:
:cool: , :eek: , :o , :p + 		Message:
You can use:
[player]Nick[/player]
[url]http://address.com/[/url]
[img]http://images.com/images3.gif[/img]
[code]Code[/code]
[b]Text[/b]
[i]Text[/i]
[u]Text[/u]
and smileys:
;) , :) , :D , :( , :rolleyes:
:cool: , :eek: , :o , :p
(Max. 15,000 letters) diff --git a/system/templates/forum.new_post.html.twig b/system/templates/forum.new_post.html.twig index bf7c20cd..2af93d37 100644 --- a/system/templates/forum.new_post.html.twig +++ b/system/templates/forum.new_post.html.twig @@ -5,7 +5,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -49,7 +49,7 @@
Post New ReplyPost New Reply
Character: (Optional)
Message:
You can use:
[player]Nick[/player]
[url]http://address.com/[/url]
[img]http://images.com/images3.gif[/img]
[code]Code[/code]
[b]Text[/b]
[i]Text[/i]
[u]Text[/u]
and smileys:
;) , :) , :D , :( , :rolleyes:
:cool: , :eek: , :o , :p		Message:
You can use:
[player]Nick[/player]
[url]http://address.com/[/url]
[img]http://images.com/images3.gif[/img]
[code]Code[/code]
[b]Text[/b]
[i]Text[/i]
[u]Text[/u]
and smileys:
;) , :) , :D , :( , :rolleyes:
:cool: , :eek: , :o , :p
(Max. 15,000 letters)
{% set i = 0 %} diff --git a/system/templates/forum.new_thread.html.twig b/system/templates/forum.new_thread.html.twig index 766c8936..77efec37 100644 --- a/system/templates/forum.new_thread.html.twig +++ b/system/templates/forum.new_thread.html.twig @@ -6,7 +6,7 @@
- Last 5 posts from thread: {{ topic|raw }} + Last 5 posts from thread: {{ topic|raw }}
@@ -24,7 +24,7 @@ - + diff --git a/system/templates/forum.show_thread.html.twig b/system/templates/forum.show_thread.html.twig index 3fb42454..9e559abd 100644 --- a/system/templates/forum.show_thread.html.twig +++ b/system/templates/forum.show_thread.html.twig @@ -6,18 +6,18 @@ Page: {{ links_to_pages|raw }}
- Post New Reply + Post New Reply
(Optional)
Message:
You can use:
[player]Nick[/player]
[url]http://address.com/[/url]
[img]http://images.com/images3.gif[/img]
[code]Code[/code]
[b]Text[/b]
[i]Text[/i]
[u]Text[/u]
and smileys:
;) , :) , :D , :( , :rolleyes:
:cool: , :eek: , :o , :p		Message:
You can use:
[player]Nick[/player]
[url]http://address.com/[/url]
[img]http://images.com/images3.gif[/img]
[code]Code[/code]
[b]Text[/b]
[i]Text[/i]
[u]Text[/u]
and smileys:
;) , :) , :D , :( , :rolleyes:
:cool: , :eek: , :o , :p
(Max. 15,000 letters)
- + {% set i = 0 %} {% for post in posts %} @@ -27,7 +27,7 @@ Page: {{ links_to_pages|raw }}
player outfit
{% endif %} - + {% if post.group is defined %} Position: {{ post.group }}
{% endif %} @@ -38,17 +38,17 @@ Page: {{ links_to_pages|raw }}
{{ guildRank }}
{% endif %}
Posts: {{ post.author_posts_count }}
- + + (Here write name of your new guild.)
- {{ thread_starter.post_topic }} -
- by {{ author_link|raw }} + {{ thread_starter.post_topic }} +
+ by {{ author_link|raw }}
- Author + Author  
{{ post.content|raw }}
- {{ post.date|date('d.m.y H:i:s') }} + {{ post.date|date('d.m.y H:i:s') }} {% if post.edited_by is defined %}
Edited by {{ post.edited_by }}
on {{ post.edit_date|date('d.m.y H:i:s') }} {% endif %} - + 		{% if is_moderator %} diff --git a/system/templates/guilds.create.html.twig b/system/templates/guilds.create.html.twig index 499665b1..eb09ec2a 100644 --- a/system/templates/guilds.create.html.twig +++ b/system/templates/guilds.create.html.twig @@ -19,14 +19,14 @@ {% endfor %}
- (Name of leader of new guild.) + (Name of leader of new guild.)
Guild name:
- (Here write name of your new guild.)
@@ -92,24 +92,24 @@ Here you can change names of ranks, delete and add ranks, pass leadership to oth
- Option + Option - Description + Description
{% set i = 0 %} diff --git a/system/templates/spells.html.twig b/system/templates/spells.html.twig index 2312110f..a44d4295 100644 --- a/system/templates/spells.html.twig +++ b/system/templates/spells.html.twig @@ -35,25 +35,25 @@
- ID/Delete Rank + ID/Delete Rank -      Name +      Name - Level of RANK in guild + Level of RANK in guild
- Leader (3) + Leader (3) - Vice (2) + Vice (2) - Member (1) + Member (1)
@@ -136,7 +136,7 @@ defined('MYAAC') or die('Direct access not allowed!');

Template:
' . template_form(); + echo 'Template:
' . template_form(); ?> diff --git a/templates/tibiacom/account.management.html.twig b/templates/tibiacom/account.management.html.twig index 00f1f009..4a566247 100644 --- a/templates/tibiacom/account.management.html.twig +++ b/templates/tibiacom/account.management.html.twig @@ -430,15 +430,15 @@ {% set i = i + 1 %} {% if player.isOnline() %} - + {% else %} - + {% endif %} diff --git a/templates/tibiacom/boxes/highscores.php b/templates/tibiacom/boxes/highscores.php index 6347911e..7df16c41 100644 --- a/templates/tibiacom/boxes/highscores.php +++ b/templates/tibiacom/boxes/highscores.php @@ -53,9 +53,9 @@ foreach(getTopPlayers(5) as $player) { echo ''; diff --git a/templates/tibiacom/index.php b/templates/tibiacom/index.php index 4fcac67e..e2af0ace 100644 --- a/templates/tibiacom/index.php +++ b/templates/tibiacom/index.php @@ -415,7 +415,7 @@ foreach($config['menu_categories'] as $id => $cat) { if($status['online']) echo '
' . $status['players'] . '

Players Online'; else - echo 'Server
OFFLINE'; + echo 'Server
OFFLINE'; ?> @@ -430,7 +430,7 @@ foreach($config['menu_categories'] as $id => $cat) { } if($config['template_allow_change']) - echo 'Template:
' . template_form(); + echo 'Template:
' . template_form(); ?> diff --git a/tools/check_name.js b/tools/check_name.js index 1ea6aab0..6074c341 100644 --- a/tools/check_name.js +++ b/tools/check_name.js @@ -17,7 +17,7 @@ function checkName() if(document.getElementById("character_name").value=="") { - $('#character_error').html('Please enter new character name.'); + $('#character_error').html('Please enter new character name.'); return; } @@ -38,11 +38,11 @@ function checkName() $.getJSON("tools/validate.php", { name: name, uid: Math.random() }, function(data){ if(data.hasOwnProperty('success')) { - $('#character_error').html ('' + data.success + ''); + $('#character_error').html ('' + data.success + ''); $('#character_indicator').attr('src', 'images/global/general/ok.gif'); } else if(data.hasOwnProperty('error')) { - $('#character_error').html('' + data.error + ''); + $('#character_error').html('' + data.error + ''); $('#character_indicator').attr('src', 'images/global/general/nok.gif'); }
- Name + Name - Words + Words - Type
(count) + Type
(count) 		- Mana + Mana - Level + Level - Magic
Level + Magic
Level 		- Soul + Soul Premium @@ -84,9 +84,9 @@ {% if spell.premium == 1 %}yes{% else %}no{% endif %} {% if spell.vocations|length > 0 %} - + {{ spell.vocations|raw }} - + {% else %} {{ config.vocations[post_vocation_id] }} {% endif %} diff --git a/templates/kathrine/template.php b/templates/kathrine/template.php index 3dc36a66..063b0648 100644 --- a/templates/kathrine/template.php +++ b/templates/kathrine/template.php @@ -116,11 +116,11 @@ defined('MYAAC') or die('Direct access not allowed!'); Server Online » + Server Online » Players Online: ' . $status['players'] . ' / ' . $status['playersMax'] . ' » Monsters: ' . $status['monsters'] . ' » Uptime: ' . (isset($status['uptimeReadable']) ? $status['uptimeReadable'] : 'Unknown') . ''; else - echo 'Server Offline'; + echo 'Server Offline'; ?>
- {{ i }}. {{ player.getName() }}{% if player.isDeleted() %} [ DELETED ] {% endif %} + {{ i }}. {{ player.getName() }}{% if player.isDeleted() %} [ DELETED ] {% endif %} {{ player.getLevel() }} {{ config.vocations[player.getVocation()] }} OnlineOnlineOfflineOffline[Edit]