Announcements - Fix coach access BT#18385

main/announcements/announcements.php

@@ -345,12 +345,18 @@ switch ($action) {
         exit;
         break;
     case 'showhide':
-        if (!isset($_GET['isStudentView']) || $_GET['isStudentView'] != 'false') {
+        if (!isset($_GET['isStudentView']) || $_GET['isStudentView'] !== 'false') {
             if (isset($_GET['id']) && $_GET['id']) {
                 if ($sessionId != 0 &&
                     api_is_allowed_to_session_edit(false, true) == false
                 ) {
-                    api_not_allowed();
+                    $block = true;
+                    if (api_get_configuration_value('allow_coach_to_edit_announcements') && api_is_coach()) {
+                        $block = false;
+                    }
+                    if ($block) {
+                        api_not_allowed();
+                    }
                 }
 
                 if (!$allowToEdit) {
@@ -373,13 +379,14 @@ switch ($action) {
         break;
     case 'add':
     case 'modify':
-        if ($sessionId != 0 &&
+        if ($sessionId != 0 && api_is_allowed_to_session_edit(false, true) === false) {
-            (
+            $block = true;
-                api_is_allowed_to_session_edit(false, true) === false &&
+            if (api_get_configuration_value('allow_coach_to_edit_announcements') && api_is_coach()) {
-                api_is_coach() === false
+                $block = false;
-            )
+            }
-        ) {
+            if ($block) {
-            api_not_allowed(true);
+                api_not_allowed();
+            }
         }
 
         if ($allowStudentInGroupToSend === false) {

main/inc/lib/AnnouncementManager.php

@@ -2005,7 +2005,6 @@ class AnnouncementManager
                         $modify_icons .= Display::return_icon('up_na.gif', get_lang('Up'));
                     }
 
-
                     if ($iterator < $bottomAnnouncement) {
                         $modify_icons .= "<a href=\"".$actionUrl."&action=move&down=".$row["id"]."&sec_token=".$stok."\">".
                             Display::return_icon('down.gif', get_lang('Down'))."</a>";