From c33940f64a1e5b59afd700010247382f5b7b2df3 Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Mon, 12 Nov 2018 14:41:23 +0100
Subject: Moved permission checks to Authenticator class

---
 includes/pages/user_news.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'includes/pages/user_news.php')

diff --git a/includes/pages/user_news.php b/includes/pages/user_news.php
index e101be6b..34be033f 100644
--- a/includes/pages/user_news.php
+++ b/includes/pages/user_news.php
@@ -91,7 +91,7 @@ function news_text($news)
  */
 function display_news($news)
 {
-    global $privileges, $page;
+    global $page;
 
     $html = '';
     $html .= '<div class="panel' . ($news['Treffen'] == 1 ? ' panel-info' : ' panel-default') . '">';
@@ -101,7 +101,7 @@ function display_news($news)
     $html .= '<div class="panel-body">' . news_text($news) . '</div>';
 
     $html .= '<div class="panel-footer text-muted">';
-    if (in_array('admin_news', $privileges)) {
+    if (auth()->can('admin_news')) {
         $html .= '<div class="pull-right">'
             . button_glyph(
                 page_link_to('admin_news', ['action' => 'edit', 'id' => $news['ID']]),
@@ -198,7 +198,6 @@ function user_news_comments()
  */
 function user_news()
 {
-    global $privileges;
     $user = auth()->user();
     $display_news = config('display_news');
     $request = request();
@@ -206,13 +205,13 @@ function user_news()
     $html = '<div class="col-md-12"><h1>' . news_title() . '</h1>' . msg();
 
     $isMeeting = $request->postData('treffen');
-    if ($request->has('text') && $request->has('betreff') && in_array('admin_news', $privileges)) {
+    if ($request->has('text') && $request->has('betreff') && auth()->can('admin_news')) {
         if (!$request->has('treffen')) {
             $isMeeting = 0;
         }
 
         $text = $request->postData('text');
-        if (!in_array('admin_news_html', $privileges)) {
+        if (!auth()->can('admin_news_html')) {
             $text = strip_tags($text);
         }
 
@@ -266,7 +265,7 @@ function user_news()
     }
     $html .= '</ul></div>';
 
-    if (in_array('admin_news', $privileges)) {
+    if (auth()->can('admin_news')) {
         $html .= '<hr />';
         $html .= '<h2>' . __('Create news:') . '</h2>';
 
-- 
cgit v1.2.3-70-g09d2