Couse Announcement: Fix send to all user in session and requested changes

main/announcements/announcements.php

@@ -625,7 +625,6 @@ switch ($action) {
         if (empty($sessionId)) {
             if ($announcementScheduledByDate) {
                 $extraField = new ExtraField('course_announcement');
-                $extraFieldValue = new ExtraFieldValue('course_announcement');
 
                 $extra = $extraField->addElements(
                     $form,
@@ -769,6 +768,8 @@ switch ($action) {
 
                     // Send mail
                     $messageSentTo = [];
+
+                    if ($announcementScheduledByDate) {
                         if (isset($_POST['email_ann']) && empty($_POST['onlyThoseMails'])) {
                             if ($data['extra_send_notification_at_a_specific_date']['extra_send_notification_at_a_specific_date'] == 0) {
                                 $messageSentTo = AnnouncementManager::sendEmail(
@@ -786,6 +787,17 @@ switch ($action) {
                             $extraFieldValue = new ExtraFieldValue('course_announcement');
                             $extraFieldValue->deleteValuesByItem($id);
                         }
+                    } else {
+                        if (isset($_POST['email_ann']) && empty($_POST['onlyThoseMails'])) {
+                            $messageSentTo = AnnouncementManager::sendEmail(
+                                api_get_course_info(),
+                                api_get_session_id(),
+                                $id,
+                                $sendToUsersInSession,
+                                isset($data['send_to_hrm_users'])
+                            );
+                        }
+                    }
 
                     if ($sendMeCopy && !in_array(api_get_user_id(), $messageSentTo)) {
                         $email = new AnnouncementEmail(api_get_course_info(), api_get_session_id(), $id);
@@ -842,11 +854,13 @@ switch ($action) {
 
                         // Send mail
                         $messageSentTo = [];
+
+                        if ($announcementScheduledByDate) {
                             if (isset($data['email_ann']) && $data['email_ann']) {
                                 if ($data['extra_send_notification_at_a_specific_date']['extra_send_notification_at_a_specific_date'] == 0) {
                                     $messageSentTo = AnnouncementManager::sendEmail(
                                         api_get_course_info(),
-                                    0,
+                                        api_get_session_id(),
                                         $insert_id,
                                         $sendToUsersInSession,
                                         isset($data['send_to_hrm_users'])
@@ -857,6 +871,17 @@ switch ($action) {
                                     $extraFieldValues->saveFieldValues($data);
                                 }
                             }
+                        } else {
+                            if (isset($data['email_ann']) && $data['email_ann']) {
+                                $messageSentTo = AnnouncementManager::sendEmail(
+                                    api_get_course_info(),
+                                    api_get_session_id(),
+                                    $insert_id,
+                                    $sendToUsersInSession,
+                                    isset($data['send_to_hrm_users'])
+                                );
+                            }
+                        }
 
                         if ($sendMeCopy && !in_array(api_get_user_id(), $messageSentTo)) {
                             $email = new AnnouncementEmail(api_get_course_info(), api_get_session_id(), $insert_id);

main/cron/course_announcement.php

@@ -41,7 +41,6 @@ foreach ($result as $announcement) {
         $dateToSend = $extraFieldValue->get_values_by_handler_and_field_variable($announcement->getId(), 'date_to_send_notification');
 
         if ($today >= $dateToSend['value']) {
-            $courseInfo = api_get_course_info_by_id($announcement->getCId());
 
             $query = "SELECT ip FROM ChamiloCourseBundle:CItemProperty ip
                         WHERE ip.ref = :announcementId AND ip.course = :courseId
@@ -49,11 +48,22 @@ foreach ($result as $announcement) {
 
             $sql = Database::getManager()->createQuery($query);
             $itemProperty = $sql->execute(['announcementId' => $announcement->getId(), 'courseId' => $announcement->getCId()]);
+            $sessionName = $itemProperty[0]->getSession();
+
+            $courseInfo = api_get_course_info_by_id($announcement->getCId());
+            $sessionId = (int) SessionManager::get_session_by_name($sessionName)['id'];
             $senderId = $itemProperty[0]->getInsertUser()->getId();
-            $sendToUsersInSession = (bool) $extraFieldValue->get_values_by_handler_and_field_variable($announcement->getId(), 'send_to_users_in_session');
+            $sendToUsersInSession = (int) $extraFieldValue->get_values_by_handler_and_field_variable($announcement->getId(), 'send_to_users_in_session')['value'];
 
-            $email = new AnnouncementEmail($courseInfo, 0, $announcement->getId());
+            $messageSentTo = AnnouncementManager::sendEmail(
-            $sendTo = $email->send($sendToUsersInSession, false, $senderId);
+                $courseInfo,
+                $sessionId,
+                $announcement->getId(),
+                $sendToUsersInSession,
+                false,
+                null,
+                $senderId
+            );
         }
     }
 }