We''re using official Tibia Client
{{ config.client / 100 }}
@@ -13,7 +13,7 @@ if($query->rowCount() === 0) {
$query = $db->query("SELECT `id` FROM `" . TABLE_PREFIX . "pages` WHERE `name` LIKE " . $db->quote('commands') . " LIMIT 1;");
if($query->rowCount() === 0) {
- $db->exec("INSERT INTO `myaac_pages` (`id`, `name`, `title`, `body`, `date`, `player_id`, `php`, `access`, `hidden`) VALUES
+ $db->exec("INSERT INTO `myaac_pages` (`id`, `name`, `title`, `body`, `date`, `player_id`, `php`, `access`, `hide`) VALUES
(null, 'commands', 'Commands', '
diff --git a/system/migrations/30.php b/system/migrations/30.php
index 5b1e409e..3d919597 100644
--- a/system/migrations/30.php
+++ b/system/migrations/30.php
@@ -2,7 +2,7 @@
$query = $db->query("SELECT `id` FROM `" . TABLE_PREFIX . "pages` WHERE `name` LIKE " . $db->quote('rules_on_the_page') . " LIMIT 1;");
if($query->rowCount() === 0) {
- $db->exec("INSERT INTO `myaac_pages` (`id`, `name`, `title`, `body`, `date`, `player_id`, `php`, `enable_tinymce`, `access`, `hidden`) VALUES
+ $db->exec("INSERT INTO `myaac_pages` (`id`, `name`, `title`, `body`, `date`, `player_id`, `php`, `enable_tinymce`, `access`, `hide`) VALUES
(null, 'rules_on_the_page', 'Rules', '1. Names
a) Names which contain insulting (e.g. \"Bastard\"), racist (e.g. \"Nigger\"), extremely right-wing (e.g. \"Hitler\"), sexist (e.g. \"Bitch\") or offensive (e.g. \"Copkiller\") language.
b) Names containing parts of sentences (e.g. \"Mike returns\"), nonsensical combinations of letters (e.g. \"Fgfshdsfg\") or invalid formattings (e.g. \"Thegreatknight\").
diff --git a/system/migrations/39.php b/system/migrations/39.php
new file mode 100644
index 00000000..697dd751
--- /dev/null
+++ b/system/migrations/39.php
@@ -0,0 +1,15 @@
+exec("ALTER TABLE `players` CHANGE `hidden` `hide` TINYINT(1) NOT NULL DEFAULT 0;");
+$db->exec("ALTER TABLE `" . TABLE_PREFIX . "changelog` CHANGE `hidden` `hide` TINYINT(1) NOT NULL DEFAULT 0;");
+$db->exec("ALTER TABLE `" . TABLE_PREFIX . "faq` CHANGE `hidden` `hide` TINYINT(1) NOT NULL DEFAULT 0;");
+$db->exec("ALTER TABLE `" . TABLE_PREFIX . "forum_boards` CHANGE `hidden` `hide` TINYINT(1) NOT NULL DEFAULT 0;");
+$db->exec("ALTER TABLE `" . TABLE_PREFIX . "monsters` CHANGE `hidden` `hide` TINYINT(1) NOT NULL DEFAULT 0;");
+$db->exec("ALTER TABLE `" . TABLE_PREFIX . "news` CHANGE `hidden` `hide` TINYINT(1) NOT NULL DEFAULT 0;");
+$db->exec("ALTER TABLE `" . TABLE_PREFIX . "news_categories` CHANGE `hidden` `hide` TINYINT(1) NOT NULL DEFAULT 0;");
+$db->exec("ALTER TABLE `" . TABLE_PREFIX . "pages` CHANGE `hidden` `hide` TINYINT(1) NOT NULL DEFAULT 0;");
+$db->exec("ALTER TABLE `" . TABLE_PREFIX . "gallery` CHANGE `hidden` `hide` TINYINT(1) NOT NULL DEFAULT 0;");
+$db->exec("ALTER TABLE `" . TABLE_PREFIX . "spells` CHANGE `hidden` `hide` TINYINT(1) NOT NULL DEFAULT 0;");
diff --git a/system/pages/account/change_comment.php b/system/pages/account/change_comment.php
index 868f38c6..e4fb6e42 100644
--- a/system/pages/account/change_comment.php
+++ b/system/pages/account/change_comment.php
@@ -40,7 +40,7 @@ if($player_name != null) {
if (isset($_POST['changecommentsave']) && $_POST['changecommentsave'] == 1) {
if(empty($errors)) {
- $player->hidden = $new_hideacc;
+ $player->hide = $new_hideacc;
$player->comment = $new_comment;
$player->save();
$account_logged->logAction('Changed comment for character ' . $player->name . '.');
diff --git a/system/pages/characters.php b/system/pages/characters.php
index 2cb5e084..b2286db6 100644
--- a/system/pages/characters.php
+++ b/system/pages/characters.php
@@ -342,8 +342,8 @@ WHERE killers.death_id = '".$death['id']."' ORDER BY killers.final_hit DESC, kil
$signature_url = BASE_URL . (setting('core.friendly_urls') ? '' : 'index.php/') . urlencode($player->getName()) . '.png';
}
- $hidden = $player->isHidden();
- if(!$hidden) {
+ $hide = $player->isHidden();
+ if(!$hide) {
// check if account has been banned
$bannedUntil = '';
$banned = array();
@@ -363,7 +363,7 @@ WHERE killers.death_id = '".$death['id']."' ORDER BY killers.final_hit DESC, kil
$query = $db->query('SELECT `id` FROM `players` WHERE `account_id` = ' . $account->getId() . ' ORDER BY `name`')->fetchAll();
foreach($query as $p) {
$_player = new OTS_Player();
- $fields = array('id', 'name', 'vocation', 'level', 'online', 'deleted', 'hidden');
+ $fields = array('id', 'name', 'vocation', 'level', 'online', 'deleted', 'hide');
$_player->load($p['id'], $fields, false);
if($_player->isLoaded() && !$_player->isHidden()) {
$account_players[] = $_player;
@@ -404,7 +404,8 @@ WHERE killers.death_id = '".$death['id']."' ORDER BY killers.final_hit DESC, kil
'frags' => $frags,
'signature_url' => isset($signature_url) ? $signature_url : null,
'player_link' => getPlayerLink($player->getName(), false),
- 'hidden' => $hidden,
+ 'hide' => $hide,
+ 'hidden' => $hide,
'bannedUntil' => isset($bannedUntil) ? $bannedUntil : null,
'account_players' => isset($account_players) ? $account_players : null,
'search_form' => generate_search_form(),
diff --git a/system/pages/creatures.php b/system/pages/creatures.php
index 672ea1a8..adafa037 100644
--- a/system/pages/creatures.php
+++ b/system/pages/creatures.php
@@ -18,7 +18,7 @@ $title = 'Creatures';
if (empty($_REQUEST['name'])) {
// display list of monsters
$preview = setting('core.monsters_images_preview');
- $creatures = Monster::where('hidden', '!=', 1)->when(!empty($_REQUEST['boss']), function ($query) {
+ $creatures = Monster::where('hide', '!=', 1)->when(!empty($_REQUEST['boss']), function ($query) {
$query->where('rewardboss', 1);
})->get()->toArray();
@@ -39,7 +39,7 @@ if (empty($_REQUEST['name'])) {
// display monster
$creature_name = urldecode(stripslashes(ucwords(strtolower($_REQUEST['name']))));
-$creature = Monster::where('hidden', '!=', 1)->where('name', $creature_name)->first()->toArray();
+$creature = Monster::where('hide', '!=', 1)->where('name', $creature_name)->first()->toArray();
if (isset($creature['name'])) {
function sort_by_chance($a, $b)
diff --git a/system/pages/faq.php b/system/pages/faq.php
index 1c7f5a29..155983b9 100644
--- a/system/pages/faq.php
+++ b/system/pages/faq.php
@@ -49,7 +49,7 @@ if($canEdit)
}
}
else if($action == 'hide') {
- FAQ::toggleHidden($id, $errors);
+ FAQ::toggleHide($id, $errors);
}
else if($action == 'moveup') {
FAQ::move($id, -1, $errors);
@@ -72,11 +72,11 @@ if($canEdit)
}
$faqs = ModelsFAQ::select('id', 'question', 'answer')->when(!$canEdit, function ($query) {
- $query->where('hidden', '!=', 1);
+ $query->where('hide', '!=', 1);
})->orderBy('ordering');
if ($canEdit) {
- $faqs->addSelect(['hidden', 'ordering']);
+ $faqs->addSelect(['hide', 'ordering']);
}
$faqs = $faqs->get()->toArray();
@@ -146,15 +146,15 @@ class FAQ
return !count($errors);
}
- static public function toggleHidden($id, &$errors)
+ static public function toggleHide($id, &$errors)
{
if(isset($id))
{
$row = ModelsFAQ::find($id);
if ($row) {
- $row->hidden = ($row->hidden == 1 ? 0 : 1);
+ $row->hide = ($row->hide == 1 ? 0 : 1);
if (!$row->save()) {
- $errors[] = 'Fail during toggle hidden FAQ.';
+ $errors[] = 'Fail during toggle hide FAQ.';
}
} else {
$errors[] = 'FAQ with id ' . $id . ' does not exists.';
diff --git a/system/pages/forum.php b/system/pages/forum.php
index c00b7f4b..51a078ae 100644
--- a/system/pages/forum.php
+++ b/system/pages/forum.php
@@ -53,7 +53,7 @@ foreach($sections as $id => $section)
'link' => getForumBoardLink($id),
'name' => $section['name'],
'description' => $section['description'],
- 'hidden' => $section['hidden'],
+ 'hide' => $section['hide'],
'posts' => isset($counters[$id]['posts']) ? $counters[$id]['posts'] : 0,
'threads' => isset($counters[$id]['threads']) ? $counters[$id]['threads'] : 0,
'last_post' => array(
diff --git a/system/pages/forum/admin.php b/system/pages/forum/admin.php
index 046452b2..d8a73eb3 100644
--- a/system/pages/forum/admin.php
+++ b/system/pages/forum/admin.php
@@ -64,7 +64,7 @@ if($canEdit) {
}
}
else if($action == 'hide_board') {
- Forum::toggleHidden_board($id, $errors);
+ Forum::toggleHide_board($id, $errors);
$action = '';
}
else if($action == 'moveup_board') {
diff --git a/system/pages/forum/base.php b/system/pages/forum/base.php
index 2ede7f2e..8da5b169 100644
--- a/system/pages/forum/base.php
+++ b/system/pages/forum/base.php
@@ -41,10 +41,10 @@ foreach(getForumBoards() as $section) {
);
if($canEdit) {
- $sections[$section['id']]['hidden'] = $section['hidden'];
+ $sections[$section['id']]['hide'] = $section['hide'];
}
else {
- $sections[$section['id']]['hidden'] = 0;
+ $sections[$section['id']]['hide'] = 0;
}
}
diff --git a/system/pages/gallery.php b/system/pages/gallery.php
index f44bd91f..cb854fca 100644
--- a/system/pages/gallery.php
+++ b/system/pages/gallery.php
@@ -48,7 +48,7 @@ if($canEdit) {
$action = $comment = $image = $author = '';
}
} else if ($action == 'hide') {
- Gallery::toggleHidden($id, $errors);
+ Gallery::toggleHide($id, $errors);
} else if ($action == 'moveup') {
Gallery::move($id, -1, $errors);
} else if ($action == 'movedown') {
@@ -107,9 +107,9 @@ if(isset($_GET['image']))
$images = Cache::remember('gallery_' . ($canEdit ? '1' : '0'), 60, function () use ($db, $canEdit) {
return $db->query('SELECT `id`, `comment`, `image`, `author`, `thumb`' .
- ($canEdit ? ', `hidden`, `ordering`' : '') .
+ ($canEdit ? ', `hide`, `ordering`' : '') .
' FROM `' . TABLE_PREFIX . 'gallery`' .
- (!$canEdit ? ' WHERE `hidden` != 1' : '') .
+ (!$canEdit ? ' WHERE `hide` != 1' : '') .
' ORDER BY `ordering`;')->fetchAll(PDO::FETCH_ASSOC);
});
@@ -204,15 +204,15 @@ class Gallery
return !count($errors);
}
- static public function toggleHidden($id, &$errors)
+ static public function toggleHide($id, &$errors)
{
if(isset($id))
{
$row = ModelsGallery::find($id);
if($row) {
- $row->hidden = $row->hidden == 1 ? 0 : 1;
+ $row->hide = $row->hide == 1 ? 0 : 1;
if (!$row->save()) {
- $errors[] = 'Fail during toggle hidden Gallery';
+ $errors[] = 'Fail during toggle hide Gallery';
}
} else
$errors[] = 'Image with id ' . $id . ' does not exists.';
diff --git a/system/pages/news.php b/system/pages/news.php
index 7dbd3f3c..0262163e 100644
--- a/system/pages/news.php
+++ b/system/pages/news.php
@@ -20,7 +20,7 @@ if(isset($_GET['archive']))
$title = 'News Archive';
$categories = array();
- foreach($db->query('SELECT id, name, icon_id FROM ' . TABLE_PREFIX . 'news_categories WHERE hidden != 1') as $cat)
+ foreach($db->query('SELECT id, name, icon_id FROM ' . TABLE_PREFIX . 'news_categories WHERE hide != 1') as $cat)
{
$categories[$cat['id']] = array(
'name' => $cat['name'],
@@ -37,7 +37,7 @@ if(isset($_GET['archive']))
if($id < 100000)
$field_name = 'id';
- $news = $db->query('SELECT * FROM `'.TABLE_PREFIX . 'news` WHERE `hidden` != 1 AND `' . $field_name . '` = ' . $id . '');
+ $news = $db->query('SELECT * FROM `'.TABLE_PREFIX . 'news` WHERE `hide` != 1 AND `' . $field_name . '` = ' . $id . '');
if($news->rowCount() == 1)
{
$news = $news->fetch();
@@ -61,7 +61,7 @@ if(isset($_GET['archive']))
$admin_options = '';
if($canEdit) {
- $admin_options = '
' . $twig->render('admin.links.html.twig', ['page' => 'news', 'id' => $news['id'], 'hidden' => $news['hidden']]);
+ $admin_options = '
' . $twig->render('admin.links.html.twig', ['page' => 'news', 'id' => $news['id'], 'hide' => $news['hide']]);
}
$twig->display('news.html.twig', array(
@@ -84,7 +84,7 @@ if(isset($_GET['archive']))
query('SELECT * FROM '.$db->tableName(TABLE_PREFIX . 'news').' WHERE `type` = 1 AND `hidden` != 1 ORDER BY `date` DESC');
+ $news_DB = $db->query('SELECT * FROM '.$db->tableName(TABLE_PREFIX . 'news').' WHERE `type` = 1 AND `hide` != 1 ORDER BY `date` DESC');
foreach($news_DB as $news)
{
$newses[] = array(
@@ -114,7 +114,7 @@ if($cache->enabled())
if(!$news_cached)
{
$categories = array();
- foreach($db->query('SELECT `id`, `name`, `icon_id` FROM `' . TABLE_PREFIX . 'news_categories` WHERE `hidden` != 1') as $cat)
+ foreach($db->query('SELECT `id`, `name`, `icon_id` FROM `' . TABLE_PREFIX . 'news_categories` WHERE `hide` != 1') as $cat)
{
$categories[$cat['id']] = array(
'name' => $cat['name'],
@@ -122,7 +122,7 @@ if(!$news_cached)
);
}
- $tickers_db = $db->query('SELECT * FROM `' . TABLE_PREFIX . 'news` WHERE `type` = ' . TICKER .($canEdit ? '' : ' AND `hidden` != 1') .' ORDER BY `date` DESC LIMIT ' . setting('core.news_ticker_limit'));
+ $tickers_db = $db->query('SELECT * FROM `' . TABLE_PREFIX . 'news` WHERE `type` = ' . TICKER .($canEdit ? '' : ' AND `hide` != 1') .' ORDER BY `date` DESC LIMIT ' . setting('core.news_ticker_limit'));
$tickers_content = '';
if($tickers_db->rowCount() > 0)
{
@@ -130,6 +130,7 @@ if(!$news_cached)
foreach($tickers as &$ticker) {
$ticker['icon'] = $categories[$ticker['category']]['icon_id'];
$ticker['body_short'] = short_text(strip_tags($ticker['body']), 100);
+ $ticker['hidden'] = $ticker['hide'];
}
$tickers_content = $twig->render('news.tickers.html.twig', array(
@@ -141,7 +142,7 @@ if(!$news_cached)
if($cache->enabled() && !$canEdit)
$cache->set('news_' . $template_name . '_' . TICKER, $tickers_content, 60 * 60);
- $featured_article_db =$db->query('SELECT `id`, `title`, `article_text`, `article_image`, `hidden` FROM `' . TABLE_PREFIX . 'news` WHERE `type` = ' . ARTICLE . ($canEdit ? '' : ' AND `hidden` != 1') .' ORDER BY `date` DESC LIMIT 1');
+ $featured_article_db =$db->query('SELECT `id`, `title`, `article_text`, `article_image`, `hide` FROM `' . TABLE_PREFIX . 'news` WHERE `type` = ' . ARTICLE . ($canEdit ? '' : ' AND `hide` != 1') .' ORDER BY `date` DESC LIMIT 1');
$article = '';
if($featured_article_db->rowCount() > 0) {
$article = $featured_article_db->fetch();
@@ -154,7 +155,8 @@ if(!$news_cached)
'title' => $article['title'],
'text' => $article['article_text'],
'image' => $article['article_image'],
- 'hidden' => $article['hidden'],
+ 'hide' => $article['hide'],
+ 'hidden' => $article['hide'],
'read_more'=> getLink('news/archive/') . $article['id']
),
'canEdit' => $canEdit
@@ -173,7 +175,7 @@ else {
if(!$news_cached)
{
ob_start();
- $newses = $db->query('SELECT * FROM ' . $db->tableName(TABLE_PREFIX . 'news') . ' WHERE type = ' . NEWS . ($canEdit ? '' : ' AND hidden != 1') . ' ORDER BY date' . ' DESC LIMIT ' . setting('core.news_limit'));
+ $newses = $db->query('SELECT * FROM ' . $db->tableName(TABLE_PREFIX . 'news') . ' WHERE type = ' . NEWS . ($canEdit ? '' : ' AND hide != 1') . ' ORDER BY date' . ' DESC LIMIT ' . setting('core.news_limit'));
if($newses->rowCount() > 0)
{
foreach($newses as $news)
@@ -187,7 +189,7 @@ if(!$news_cached)
$admin_options = '';
if($canEdit) {
- $admin_options = '
' . $twig->render('admin.links.html.twig', ['page' => 'news', 'id' => $news['id'], 'hidden' => $news['hidden']]);
+ $admin_options = '
' . $twig->render('admin.links.html.twig', ['page' => 'news', 'id' => $news['id'], 'hide' => $news['hide']]);
}
$content_ = $news['body'];
@@ -209,7 +211,7 @@ if(!$news_cached)
'icon' => $categories[$news['category']]['icon_id'],
'author' => setting('core.news_author') ? $author : '',
'comments' => $news['comments'] != 0 ? getForumThreadLink($news['comments']) : null,
- 'hidden'=> $news['hidden']
+ 'hide'=> $news['hide']
));
}
}
diff --git a/system/pages/spells.php b/system/pages/spells.php
index 28bcbb23..c3f18a45 100644
--- a/system/pages/spells.php
+++ b/system/pages/spells.php
@@ -37,7 +37,7 @@ else {
$order = 'name';
$spells = array();
-$spells_db = Spell::where('hidden', '!=', 1)->where('type', '<', 4)->orderBy($order)->get();
+$spells_db = Spell::where('hide', '!=', 1)->where('type', '<', 4)->orderBy($order)->get();
if((string)$vocation_id != 'all') {
foreach($spells_db as $spell) {
diff --git a/system/router.php b/system/router.php
index 0f90071d..53b3d9e4 100644
--- a/system/router.php
+++ b/system/router.php
@@ -221,7 +221,7 @@ else {
$content .= $tmp_content;
if (hasFlag(FLAG_CONTENT_PAGES) || superAdmin()) {
$pageInfo = getCustomPageInfo($pageName);
- $content = $twig->render('admin.links.html.twig', ['page' => 'pages', 'id' => $pageInfo !== null ? $pageInfo['id'] : 0, 'hidden' => $pageInfo !== null ? $pageInfo['hidden'] : '0']
+ $content = $twig->render('admin.links.html.twig', ['page' => 'pages', 'id' => $pageInfo !== null ? $pageInfo['id'] : 0, 'hide' => $pageInfo !== null ? $pageInfo['hide'] : '0']
) . $content;
}
diff --git a/system/src/Admin/Pages.php b/system/src/Admin/Pages.php
index f906523d..bbac5c17 100644
--- a/system/src/Admin/Pages.php
+++ b/system/src/Admin/Pages.php
@@ -117,19 +117,19 @@ class Pages
return !count($errors);
}
- static public function toggleHidden($id, &$errors, &$status)
+ static public function toggleHide($id, &$errors, &$status)
{
if (isset($id)) {
$row = ModelsPages::find($id);
if ($row) {
- $row->hidden = $row->hidden == 1 ? 0 : 1;
+ $row->hide = $row->hide == 1 ? 0 : 1;
if (!$row->save()) {
- $errors[] = 'Fail during toggle hidden Page.';
+ $errors[] = 'Fail during toggle hide Page.';
}
else {
clearRouteCache();
}
- $status = $row->hidden;
+ $status = $row->hide;
}
else {
$errors[] = 'Page with id ' . $id . ' does not exists.';
diff --git a/system/src/Changelog.php b/system/src/Changelog.php
index c2827451..bd07c400 100644
--- a/system/src/Changelog.php
+++ b/system/src/Changelog.php
@@ -88,17 +88,17 @@ class Changelog
return true;
}
- static public function toggleHidden($id, &$errors, &$status)
+ static public function toggleHide($id, &$errors, &$status)
{
if(isset($id))
{
$row = ModelsChangelog::find($id);
if ($row) {
- $row->hidden = $row->hidden == 1 ? 0 : 1;
+ $row->hide = $row->hide == 1 ? 0 : 1;
if (!$row->save()) {
- $errors[] = 'Fail during toggle hidden Changelog.';
+ $errors[] = 'Fail during toggle hide Changelog.';
}
- $status = $row->hidden;
+ $status = $row->hide;
} else {
$errors[] = 'Changelog with id ' . $id . ' does not exists.';
}
diff --git a/system/src/Forum.php b/system/src/Forum.php
index 11427a14..ec9baee5 100644
--- a/system/src/Forum.php
+++ b/system/src/Forum.php
@@ -155,14 +155,14 @@ class Forum
return !count($errors);
}
- public static function toggleHidden_board($id, &$errors)
+ public static function toggleHide_board($id, &$errors)
{
global $db;
if(isset($id))
{
$query = self::get_board($id);
if($query !== false)
- $db->update(TABLE_PREFIX . 'forum_boards', array('hidden' => ($query['hidden'] == 1 ? 0 : 1)), array('id' => $id));
+ $db->update(TABLE_PREFIX . 'forum_boards', array('hide' => ($query['hide'] == 1 ? 0 : 1)), array('id' => $id));
else
$errors[] = 'Forum board with id ' . $id . ' does not exists.';
}
diff --git a/system/src/Models/Changelog.php b/system/src/Models/Changelog.php
index ec545d01..2fd03200 100644
--- a/system/src/Models/Changelog.php
+++ b/system/src/Models/Changelog.php
@@ -11,6 +11,6 @@ class Changelog extends Model {
public $timestamps = false;
public function scopeIsPublic($query) {
- $query->where('hidden', '!=', 1);
+ $query->where('hide', '!=', 1);
}
}
diff --git a/system/src/Models/FAQ.php b/system/src/Models/FAQ.php
index 098f9930..c1be9592 100644
--- a/system/src/Models/FAQ.php
+++ b/system/src/Models/FAQ.php
@@ -10,5 +10,5 @@ class FAQ extends Model {
public $timestamps = false;
- protected $fillable = ['question', 'answer', 'ordering', 'hidden'];
+ protected $fillable = ['question', 'answer', 'ordering', 'hide'];
}
diff --git a/system/src/Models/News.php b/system/src/Models/News.php
index ab07341e..61f52b5f 100644
--- a/system/src/Models/News.php
+++ b/system/src/Models/News.php
@@ -12,7 +12,7 @@ class News extends Model {
protected $fillable = [
'title', 'body', 'type', 'date', 'category', 'player_id',
'last_modified_by', 'last_modified_date', 'comments', 'article_text',
- 'article_image', 'hidden'
+ 'article_image', 'hide'
];
public function player()
diff --git a/system/src/Models/Pages.php b/system/src/Models/Pages.php
index 44e6b0f6..cadf9276 100644
--- a/system/src/Models/Pages.php
+++ b/system/src/Models/Pages.php
@@ -9,13 +9,13 @@ class Pages extends Model {
public $timestamps = false;
- protected $fillable = ['name', 'title', 'body', 'date', 'player_id', 'php', 'enable_tinymce', 'access', 'hidden'];
+ protected $fillable = ['name', 'title', 'body', 'date', 'player_id', 'php', 'enable_tinymce', 'access', 'hide'];
protected $casts = [
'player_id' => 'integer',
'enable_tinymce' => 'integer',
'access' => 'integer',
- 'hidden' => 'integer',
+ 'hide' => 'integer',
];
public function player()
@@ -24,7 +24,7 @@ class Pages extends Model {
}
public function scopeIsPublic($query) {
- $query->where('hidden', '!=', 1);
+ $query->where('hide', '!=', 1);
}
}
diff --git a/system/src/News.php b/system/src/News.php
index 1a6b88d2..02923837 100644
--- a/system/src/News.php
+++ b/system/src/News.php
@@ -101,18 +101,18 @@ class News
return true;
}
- static public function toggleHidden($id, &$errors, &$status)
+ static public function toggleHide($id, &$errors, &$status)
{
if(isset($id))
{
$row = ModelsNews::find($id);
if($row)
{
- $row->hidden = $row->hidden == 1 ? 0 : 1;
+ $row->hide = $row->hide == 1 ? 0 : 1;
if (!$row->save()) {
- $errors[] = 'Fail during toggle hidden News.';
+ $errors[] = 'Fail during toggle hide News.';
}
- $status = $row->hidden;
+ $status = $row->hide;
}
else
$errors[] = 'News with id ' . $id . ' does not exists.';
diff --git a/system/src/Spells.php b/system/src/Spells.php
index c187af2a..4438bd6e 100644
--- a/system/src/Spells.php
+++ b/system/src/Spells.php
@@ -81,7 +81,7 @@ class Spells {
'conjure_count' => $spell->getConjureCount(),
'conjure_id' => $spell->getConjureId(),
'reagent' => $spell->getReagentId(),
- 'hidden' => $spell->isEnabled() ? 0 : 1
+ 'hide' => $spell->isEnabled() ? 0 : 1
));
if($show) {
@@ -121,7 +121,7 @@ class Spells {
'premium' => $spell->isPremium() ? 1 : 0,
'vocations' => json_encode($spell->getVocations()),
'conjure_count' => 0,
- 'hidden' => $spell->isEnabled() ? 0 : 1
+ 'hide' => $spell->isEnabled() ? 0 : 1
));
if($show) {
@@ -159,7 +159,7 @@ class Spells {
'vocations' => json_encode($spell->getVocations()),
'conjure_count' => 0,
'item_id' => $spell->getID(),
- 'hidden' => $spell->isEnabled() ? 0 : 1
+ 'hide' => $spell->isEnabled() ? 0 : 1
));
if($show) {
diff --git a/system/templates/account.change_comment.html.twig b/system/templates/account.change_comment.html.twig
index 6c133d2b..04e20c0b 100644
--- a/system/templates/account.change_comment.html.twig
+++ b/system/templates/account.change_comment.html.twig
@@ -37,7 +37,7 @@ If you do not want to specify a certain field, just leave it blank.
Hide Account: |
-
+
{% if player.group_id > 1 %} (you will be also hidden on the Team page!){% endif %}
|
diff --git a/system/templates/admin.changelog.html.twig b/system/templates/admin.changelog.html.twig
index e763c160..7581beef 100644
--- a/system/templates/admin.changelog.html.twig
+++ b/system/templates/admin.changelog.html.twig
@@ -51,7 +51,7 @@
{{ csrf() }}
-
+
diff --git a/system/templates/admin.links.html.twig b/system/templates/admin.links.html.twig
index ca2ca059..ac9b1134 100644
--- a/system/templates/admin.links.html.twig
+++ b/system/templates/admin.links.html.twig
@@ -19,7 +19,7 @@
{{ csrf() }}
-
+
diff --git a/system/templates/admin.news.table.html.twig b/system/templates/admin.news.table.html.twig
index 5e3633df..924b87b8 100644
--- a/system/templates/admin.news.table.html.twig
+++ b/system/templates/admin.news.table.html.twig
@@ -52,7 +52,7 @@
{{ csrf() }}
-
+
diff --git a/system/templates/admin.pages.html.twig b/system/templates/admin.pages.html.twig
index 5ee6e1db..b4c524ce 100644
--- a/system/templates/admin.pages.html.twig
+++ b/system/templates/admin.pages.html.twig
@@ -44,7 +44,7 @@
{{ csrf() }}
-
+
diff --git a/system/templates/changelog.html.twig b/system/templates/changelog.html.twig
index 4e2d584f..8133dc4a 100644
--- a/system/templates/changelog.html.twig
+++ b/system/templates/changelog.html.twig
@@ -25,7 +25,7 @@
{{ log.body|nl2br}} |
{% if canEdit %}
- {{ include('admin.links.html.twig', {page: 'changelog', id: log.id, hidden: log.hidden }) }}
+ {{ include('admin.links.html.twig', {page: 'changelog', id: log.id, hide: log.hide }) }}
|
{% endif %}
diff --git a/system/templates/characters.html.twig b/system/templates/characters.html.twig
index b4d8b359..ec00758e 100644
--- a/system/templates/characters.html.twig
+++ b/system/templates/characters.html.twig
@@ -328,7 +328,7 @@
{% endif %}
{{ hook(constant('HOOK_CHARACTERS_AFTER_SIGNATURE')) }}
- {% if not hidden %}
+ {% if not player.isHidden() %}
{% set rows = 0 %}
diff --git a/system/templates/commands.html.twig b/system/templates/commands.html.twig
index 381e0020..a68ae414 100644
--- a/system/templates/commands.html.twig
+++ b/system/templates/commands.html.twig
@@ -20,8 +20,8 @@
Delete
-
- 
{% if command.hidden != 1 %}Hide{% else %}Show{% endif %}
+
+ 
{% if command.hide != 1 %}Hide{% else %}Show{% endif %}
{% if i != 1 %}
@@ -37,4 +37,4 @@
{% endif %}
{% endfor %}
-
\ No newline at end of file
+
diff --git a/system/templates/faq.html.twig b/system/templates/faq.html.twig
index c6ff405e..f4562fcf 100644
--- a/system/templates/faq.html.twig
+++ b/system/templates/faq.html.twig
@@ -29,8 +29,8 @@
Delete
-
- 
{% if faq.hidden != 1 %}Hide{% else %}Show{% endif %}
+
+ 
{% if faq.hide != 1 %}Hide{% else %}Show{% endif %}
{% if i != 1 %}
@@ -67,4 +67,4 @@
expanded = !expanded;
}
-
\ No newline at end of file
+
diff --git a/system/templates/forum.boards.html.twig b/system/templates/forum.boards.html.twig
index ffaadc51..fe32c3d1 100644
--- a/system/templates/forum.boards.html.twig
+++ b/system/templates/forum.boards.html.twig
@@ -43,8 +43,8 @@
Delete
-
- 
{% if board.hidden != 1 %}Hide{% else %}Show{% endif %}
+
+ 
{% if board.hide != 1 %}Hide{% else %}Show{% endif %}
{% if i != 1 %}
@@ -60,4 +60,4 @@
{% endif %}
{% endfor %}
-
\ No newline at end of file
+
diff --git a/system/templates/gallery.html.twig b/system/templates/gallery.html.twig
index f7121b48..49e8aafa 100644
--- a/system/templates/gallery.html.twig
+++ b/system/templates/gallery.html.twig
@@ -18,8 +18,8 @@ Click on the image to enlarge.
Delete
-
- 
{% if image.hidden != 1 %}Hide{% else %}Show{% endif %}
+
+ 
{% if image.hide != 1 %}Hide{% else %}Show{% endif %}
{% if i != 1 %}
@@ -35,4 +35,4 @@ Click on the image to enlarge.
{% endif %}
-{% endfor %}
\ No newline at end of file
+{% endfor %}
diff --git a/templates/tibiacom/news.featured_article.html.twig b/templates/tibiacom/news.featured_article.html.twig
index 58b69a93..c78f61b1 100644
--- a/templates/tibiacom/news.featured_article.html.twig
+++ b/templates/tibiacom/news.featured_article.html.twig
@@ -20,7 +20,7 @@
{{ article.title|raw }}
{% if canEdit %}
- {{ include('admin.links.html.twig', {page: 'news', id: article.id, hidden: article.hidden }) }}
+ {{ include('admin.links.html.twig', {page: 'news', id: article.id, hide: article.hide }) }}
{% endif %}
diff --git a/templates/tibiacom/news.tickers.html.twig b/templates/tibiacom/news.tickers.html.twig
index 9cb54161..d005870c 100644
--- a/templates/tibiacom/news.tickers.html.twig
+++ b/templates/tibiacom/news.tickers.html.twig
@@ -20,7 +20,7 @@
{{ ticker.body_short|raw }}
{{ ticker.body|raw }}
{% if canEdit %}
- {{ include('admin.links.html.twig', {page: 'news', id: ticker.id, hidden: ticker.hidden }) }}
+ {{ include('admin.links.html.twig', {page: 'news', id: ticker.id, hide: ticker.hide }) }}
{% endif %}