Digitalstack/myaac
2
0
Fork 0
mirror of https://github.com/slawkens/myaac.git synced 2025-10-14 09:44:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Change hidden to hide (Eloquent blocked keyword)

Browse Source
This commit is contained in:
slawkens
2024-01-27 16:54:48 +01:00
parent 3554b41172
commit d71bab648d
48 changed files with 143 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
system/pages/account/change_comment.php
View File

@@ -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 <b>' . $player->name . '</b>.');

9
system/pages/characters.php
View File

@@ -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(),

4
system/pages/creatures.php
View File

@@ -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)

12
system/pages/faq.php
View File

@@ -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.';

2
system/pages/forum.php
View File

@@ -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(

2
system/pages/forum/admin.php
View File

@@ -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') {

4
system/pages/forum/base.php
View File

@@ -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;
}
}

12
system/pages/gallery.php
View File

@@ -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.';

24
system/pages/news.php
View File

@@ -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 = '<br/><br/>' . $twig->render('admin.links.html.twig', ['page' => 'news', 'id' => $news['id'], 'hidden' => $news['hidden']]);
$admin_options = '<br/><br/>' . $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']))
<?php
$newses = array();
$news_DB = $db->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 = '<br/><br/>' . $twig->render('admin.links.html.twig', ['page' => 'news', 'id' => $news['id'], 'hidden' => $news['hidden']]);
$admin_options = '<br/><br/>' . $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']
));
}
}

2
system/pages/spells.php
View File

@@ -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) {