From 0ffd5a34a065ec2ef927a7a6ab1e88417c8f32aa Mon Sep 17 00:00:00 2001
From: Tony ID <tony.inuma@beeznest.com>
Date: Fri, 16 Jul 2021 12:40:58 -0500
Subject: [PATCH] Course announcement: Fix variable names and add script sql to
 create extrafields

---
 main/announcements/announcements.php | 12 ++++++------
 main/cron/course_announcement.php    | 10 ++++++----
 main/install/configuration.dist.php  |  7 +++++++
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/main/announcements/announcements.php b/main/announcements/announcements.php
index 93b15d857a..1f9f108485 100755
--- a/main/announcements/announcements.php
+++ b/main/announcements/announcements.php
@@ -642,16 +642,16 @@ switch ($action) {
         if (api_get_configuration_value('course_announcement_scheduled_by_date')) {
 
             // Extra fields
-            $extra_field = new ExtraField('course_announcement');
+            $extraField = new ExtraField('course_announcement');
             $extraFieldValue = new ExtraFieldValue('course_announcement');
-            $values_checkbox = $extraFieldValue->get_values_by_handler_and_field_variable($id, 'send_notification_at_a_specific_date');
+            $valueCheckbox = $extraFieldValue->get_values_by_handler_and_field_variable($id, 'send_notification_at_a_specific_date');
 
             $form->addElement('html', '<div id="email_ann_date">');
             if (!$id) {
                 $defaults['extra_date_to_send_notification'] = date('Y-m-d', strtotime(' +1 day'));
             }
 
-            $extra = $extra_field->addElements(
+            $extra = $extraField->addElements(
                 $form,
                 $id ? $id : 0,
                 [],
@@ -664,10 +664,10 @@ switch ($action) {
                 true
             );
 
-            $element_conditional = $values_checkbox['value'] == 0 ? '<div id="course_announcement_date" style="display:none">' : '<div id="course_announcement_date">';
+            $elementConditional = $valueCheckbox['value'] == 0 ? '<div id="course_announcement_date" style="display:none">' : '<div id="course_announcement_date">';
 
-            $form->addElement('html', $element_conditional);
-            $extra = $extra_field->addElements(
+            $form->addElement('html', $elementConditional);
+            $extra = $extraField->addElements(
                 $form,
                 $id ? $id : 0,
                 [],
diff --git a/main/cron/course_announcement.php b/main/cron/course_announcement.php
index e5e4cda9db..4290f6cd57 100644
--- a/main/cron/course_announcement.php
+++ b/main/cron/course_announcement.php
@@ -1,14 +1,16 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-require __DIR__ . '/../inc/global.inc.php';
+require __DIR__.'/../inc/global.inc.php';
+
+if (php_sapi_name() != 'cli') {
+    exit; //do not run from browser
+}
 
 if (!api_get_configuration_value('course_announcement_scheduled_by_date')) {
     exit;
 }
 
-$now = api_get_utc_datetime();
-
 $dql = "SELECT a
             FROM ChamiloCourseBundle:CAnnouncement a
             JOIN ChamiloCourseBundle:CItemProperty ip
@@ -28,6 +30,7 @@ if (!$result) {
 }
 
 $extraFieldValue = new ExtraFieldValue('course_announcement');
+$today = date('Y-m-d');
 
 foreach ($result as $announcement) {
 
@@ -36,7 +39,6 @@ foreach ($result as $announcement) {
     if ($send_notification['value'] == 1) {
 
         $date_to_send = $extraFieldValue->get_values_by_handler_and_field_variable($announcement->getId(), 'date_to_send_notification');
-        $today = date('Y-m-d');
 
         if ($today >= $date_to_send['value']) {
             $course_info = api_get_course_info_by_id($announcement->getCId());
diff --git a/main/install/configuration.dist.php b/main/install/configuration.dist.php
index 8919481c9d..bdb897bdde 100755
--- a/main/install/configuration.dist.php
+++ b/main/install/configuration.dist.php
@@ -1966,6 +1966,13 @@ ALTER TABLE gradebook_comment ADD CONSTRAINT FK_C3B70763AD3ED51C FOREIGN KEY (gr
 //$_configuration['course_creation_form_set_course_category_mandatory'] = false;
 
 // Show option to set course announcement date
+// Allow send notification at a especific Date. Require DB changes:
+/*
+INSERT INTO `chamilo`.`extra_field`(`extra_field_type`, `field_type`, `variable`, `display_text`, `default_value`, `field_order`, `visible_to_self`, `visible_to_others`, `changeable`, `filter`, `created_at`)
+VALUES (21, 13, 'send_notification_at_a_specific_date', 'Send notification at a specific date', '', 0, 1, 0, 0, 0, NOW());
+INSERT INTO `chamilo`.`extra_field`(`extra_field_type`, `field_type`, `variable`, `display_text`, `default_value`, `field_order`, `visible_to_self`, `visible_to_others`, `changeable`, `filter`, `created_at`)
+VALUES (21, 6, 'date_to_send_notification', 'Date to send notification', '', 0, 1, 0, 0, 0, NOW());
+*/
 //$_configuration['course_announcement_scheduled_by_date'] = false;
 
 // Enable upload of large SCORM files from FTP by uploading them to app/cache/