From d03989481b0c62c926eabfc2b512bef07c0ec68a Mon Sep 17 00:00:00 2001 From: whiteblXK Date: Sat, 16 Mar 2019 10:33:08 +0100 Subject: [PATCH] More changes to news admin --- admin/template/template.php | 12 ++-- system/pages/admin/news.php | 75 ++++++++++++---------- system/templates/admin.news.form.html.twig | 12 ++-- system/templates/admin.news.html.twig | 6 +- 4 files changed, 58 insertions(+), 47 deletions(-) diff --git a/admin/template/template.php b/admin/template/template.php index ef3e6393..3bbb62f4 100644 --- a/admin/template/template.php +++ b/admin/template/template.php @@ -56,12 +56,12 @@ 'dashboard', diff --git a/system/pages/admin/news.php b/system/pages/admin/news.php index 53baf7dd..152ad99f 100644 --- a/system/pages/admin/news.php +++ b/system/pages/admin/news.php @@ -84,7 +84,8 @@ if(!empty($action)) } } else if($action == 'hide') { - News::toggleHidden($id, $errors); + News::toggleHidden($id, $errors, $status); + success(($status == 1 ? 'Show' : 'Hide') . " successful."); } if(!empty($errors)) @@ -100,32 +101,34 @@ foreach($db->query('SELECT `id`, `name`, `icon_id` FROM `' . TABLE_PREFIX . 'new ); } -if($action == 'edit') { - $player = new OTS_Player(); - $player->load($player_id); -} +if($action == 'edit' || $action == 'new') { + if($action == 'edit') { + $player = new OTS_Player(); + $player->load($player_id); + } -$account_players = $account_logged->getPlayersList(); -$account_players->orderBy('group_id', POT::ORDER_DESC); -$twig->display('admin.news.form.html.twig', array( - 'action' => $action, - 'news_link' => getLink(PAGE), - 'news_link_form' => '?p=news&action=' . ($action == 'edit' ? 'edit' : 'add'), - 'news_id' => isset($id) ? $id : null, - 'title' => isset($p_title) ? $p_title : '', - 'body' => isset($body) ? htmlentities($body, ENT_COMPAT, 'UTF-8') : '', - 'type' => isset($type) ? $type : null, - 'player' => isset($player) && $player->isLoaded() ? $player : null, - 'player_id' => isset($player_id) ? $player_id : null, - 'account_players' => $account_players, - 'category' => isset($category) ? $category : 0, - 'categories' => $categories, - 'forum_boards' => getForumBoards(), - 'forum_section' => isset($forum_section) ? $forum_section : null, - 'comments' => isset($comments) ? $comments : null, - 'article_text' => isset($article_text) ? $article_text : null, - 'article_image' => isset($article_image) ? $article_image : null -)); + $account_players = $account_logged->getPlayersList(); + $account_players->orderBy('group_id', POT::ORDER_DESC); + $twig->display('admin.news.form.html.twig', array( + 'action' => $action, + 'news_link' => getLink(PAGE), + 'news_link_form' => '?p=news&action=' . ($action == 'edit' ? 'edit' : 'add'), + 'news_id' => isset($id) ? $id : null, + 'title' => isset($p_title) ? $p_title : '', + 'body' => isset($body) ? htmlentities($body, ENT_COMPAT, 'UTF-8') : '', + 'type' => isset($type) ? $type : null, + 'player' => isset($player) && $player->isLoaded() ? $player : null, + 'player_id' => isset($player_id) ? $player_id : null, + 'account_players' => $account_players, + 'category' => isset($category) ? $category : 0, + 'categories' => $categories, + 'forum_boards' => getForumBoards(), + 'forum_section' => isset($forum_section) ? $forum_section : null, + 'comments' => isset($comments) ? $comments : null, + 'article_text' => isset($article_text) ? $article_text : null, + 'article_image' => isset($article_image) ? $article_image : null + )); +} $query = $db->query('SELECT * FROM ' . $db->tableName(TABLE_PREFIX . 'news')); $newses = $tickers = $articles = array(); @@ -136,30 +139,33 @@ foreach ($query as $_news) { if($_news['type'] == constant('NEWS')){ $newses[] = array( 'id' => $_news['id'], + 'hidden' => $_news['hidden'], 'archive_link' => getLink('news') . '/archive/' . $_news['id'], 'title' => $_news['title'], 'date' => $_news['date'], - 'player_name' => $_player->getName(), - 'player_link' => getPlayerLink($_player->getName(), false), + 'player_name' => isset($_player) && $_player->isLoaded() ? $_player->getName() : '', + 'player_link' => isset($_player) && $_player->isLoaded() ? getPlayerLink($_player->getName(), false) : '', ); } else if ($_news['type'] == constant('TICKER')) { $tickers[] = array( 'id' => $_news['id'], + 'hidden' => $_news['hidden'], 'archive_link' => getLink('news') . '/archive/' . $_news['id'], 'title' => $_news['title'], 'date' => $_news['date'], - 'player_name' => $_player->getName(), - 'player_link' => getPlayerLink($_player->getName(), false), + 'player_name' => isset($_player) && $_player->isLoaded() ? $_player->getName() : '', + 'player_link' => isset($_player) && $_player->isLoaded() ? getPlayerLink($_player->getName(), false) : '', ); } else if ($_news['type'] == constant('ARTICLE')) { $articles[] = array( 'id' => $_news['id'], + 'hidden' => $_news['hidden'], 'archive_link' => getLink('news') . '/archive/' . $_news['id'], 'title' => $_news['title'], 'date' => $_news['date'], - 'player_name' => $_player->getName(), - 'player_link' => getPlayerLink($_player->getName(), false), + 'player_name' => isset($_player) && $_player->isLoaded() ? $_player->getName() : '', + 'player_link' => isset($_player) && $_player->isLoaded() ? getPlayerLink($_player->getName(), false) : '', ); } } @@ -238,14 +244,17 @@ class News return !count($errors); } - static public function toggleHidden($id, &$errors) + static public function toggleHidden($id, &$errors, &$status) { global $db; if(isset($id)) { $query = $db->select(TABLE_PREFIX . 'news', array('id' => $id)); if($query !== false) + { $db->update(TABLE_PREFIX . 'news', array('hidden' => ($query['hidden'] == 1 ? 0 : 1)), array('id' => $id)); + $status = $query['hidden']; + } else $errors[] = 'News with id ' . $id . ' does not exists.'; } diff --git a/system/templates/admin.news.form.html.twig b/system/templates/admin.news.form.html.twig index 344dac7d..3222c85a 100644 --- a/system/templates/admin.news.form.html.twig +++ b/system/templates/admin.news.form.html.twig @@ -20,7 +20,7 @@
- +
@@ -28,7 +28,7 @@
- +
+
@@ -70,7 +70,7 @@ {% endif %}
- +
@@ -99,9 +100,10 @@
+
{% for id, cat in categories %} - + {% endfor %}
diff --git a/system/templates/admin.news.html.twig b/system/templates/admin.news.html.twig index e781df9c..49ad1f7b 100644 --- a/system/templates/admin.news.html.twig +++ b/system/templates/admin.news.html.twig @@ -24,7 +24,7 @@ {{ news.id|raw }} {{ news.title }} {{ news.date|date(config.news_date_format) }} - {{ news.player_name }} + {{ news.player_name }} @@ -85,7 +85,7 @@ {{ ticker.id|raw }} {{ ticker.title }} {{ ticker.date|date(config.news_date_format) }} - {{ ticker.player_name }} + {{ ticker.player_name }} @@ -146,7 +146,7 @@ {{ article.id|raw }} {{ article.title }} {{ article.date|date(config.news_date_format) }} - {{ article.player_name }} + {{ article.player_name }}