From e5a7ab129b81daa8feb7a17eae7ecdd1fd33a252 Mon Sep 17 00:00:00 2001
From: Yannick Warnier <ywarnier@beeznest.org>
Date: Tue, 16 Jan 2024 15:19:16 +0100
Subject: [PATCH] Admin: Fix query in system announcements

---
 public/main/admin/system_announcements.php    |  8 ++++----
 .../main/inc/lib/system_announcements.lib.php | 19 ++++++++++++++-----
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/public/main/admin/system_announcements.php b/public/main/admin/system_announcements.php
index 2f6bd9b1d8..f5bca44eea 100644
--- a/public/main/admin/system_announcements.php
+++ b/public/main/admin/system_announcements.php
@@ -80,7 +80,7 @@ function showCareer() {
         );
         $.each(data, function(index, value) {
             $("#promotion_id").append(
-                $("<option>", {value: value.id, text: value.name})
+                $("<option>", {value: value.id, text: value.title})
             );
         });
         $("#promotion_id").selectpicker("refresh");
@@ -210,7 +210,7 @@ if ($action_todo) {
     if ($allowCareers) {
         $career = new Career();
         $careerList = $career->get_all();
-        $list = array_column($careerList, 'name', 'id');
+        $list = array_column($careerList, 'title', 'id');
 
         $form->addSelect(
             'career_id',
@@ -229,7 +229,7 @@ if ($action_todo) {
             $promotion = new Promotion();
             $promotion = $promotion->get($values['promotion_id']);
             if ($promotion) {
-                $options = [$promotion['id'] => $promotion['name']];
+                $options = [$promotion['id'] => $promotion['title']];
                 $display = 'block';
             }
         }
@@ -287,7 +287,7 @@ if ($action_todo) {
     $group_list = $userGroup->get_all();
 
     if (!empty($group_list)) {
-        $group_list = array_column($group_list, 'name', 'id');
+        $group_list = array_column($group_list, 'title', 'id');
         $group_list[0] = get_lang('All');
         $form->addSelect(
             'group',
diff --git a/public/main/inc/lib/system_announcements.lib.php b/public/main/inc/lib/system_announcements.lib.php
index 89e38f4672..6aed906f48 100644
--- a/public/main/inc/lib/system_announcements.lib.php
+++ b/public/main/inc/lib/system_announcements.lib.php
@@ -297,25 +297,34 @@ class SystemAnnouncementManager
     /**
      * Gets the groups of this announce.
      *
-     * @param int announcement id
+     * @param int $announcement_id announcement id
      *
      * @return array array of group id
+     * @throws Exception
      */
-    public static function get_announcement_groups($announcement_id)
+    public static function get_announcement_groups(int $announcement_id): array
     {
+        if (empty($announcement_id)) {
+            return [];
+        }
         $tbl_announcement_group = Database::get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS_GROUPS);
         $tbl_group = Database::get_main_table(TABLE_USERGROUP);
         //first delete all group associations for this announcement
         $sql = "SELECT
                     g.id as group_id,
-                    g.name as group_name
+                    g.title as group_name
                 FROM $tbl_group g , $tbl_announcement_group ag
                 WHERE
-                    announcement_id =".intval($announcement_id)." AND
+                    announcement_id = $announcement_id AND
                     ag.group_id = g.id";
         $res = Database::query($sql);
 
-        return Database::fetch_array($res);
+        $array = Database::fetch_array($res);
+        if (!empty($array)) {
+            return $array;
+        }
+
+        return [];
     }
 
     /**