chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add config 'system_announce_extra_roles'

Browse Source 
- add/update functions changed in order to use array instead of 1 variable
- News list changed
- Requires DB change only if setting is on:

ALTER TABLE sys_announcement ADD COLUMN visible_drh INT DEFAULT 0;
ALTER TABLE sys_announcement ADD COLUMN visible_session_admin INT DEFAULT 0;
ALTER TABLE sys_announcement ADD COLUMN visible_boss INT DEFAULT 0;

see BT#12476
pull/2487/head
jmontoyaa 8 years ago
parent 176de61508
commit a07a88657b
3 changed files with 156 additions and 118 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 95
      main/admin/system_announcements.php
  2. 117
      main/inc/lib/system_announcements.lib.php
  3. 2
      main/install/configuration.dist.php

95
main/admin/system_announcements.php
Unescape View File

@ -28,8 +28,9 @@ $interbreadcrumb[] = array(
"name" => get_lang('PlatformAdmin'), "name" => get_lang('PlatformAdmin'),
); );
$tool_name = null; $visibleToUsers = SystemAnnouncementManager::getVisibilityList();
$tool_name = null;
if (empty($_GET['lang'])) { if (empty($_GET['lang'])) {
$_GET['lang'] = isset($_SESSION['user_language_choice']) ? $_SESSION['user_language_choice'] : null; $_GET['lang'] = isset($_SESSION['user_language_choice']) ? $_SESSION['user_language_choice'] : null;
} }
@ -54,7 +55,6 @@ if (!empty($action)) {
// Displaying the header. // Displaying the header.
Display :: display_header($tool_name); Display :: display_header($tool_name);
if ($action != 'add' && $action != 'edit') { if ($action != 'add' && $action != 'edit') {
echo '<div class="actions">'; echo '<div class="actions">';
echo '<a href="?action=add">'.Display::return_icon('add.png', get_lang('AddAnnouncement'), array(), 32).'</a>'; echo '<a href="?action=add">'.Display::return_icon('add.png', get_lang('AddAnnouncement'), array(), 32).'</a>';
@ -78,7 +78,7 @@ switch ($action) {
if ($action == 'make_visible') { if ($action == 'make_visible') {
$status = true; $status = true;
} }
SystemAnnouncementManager:: set_visibility( SystemAnnouncementManager::set_visibility(
$_GET['id'], $_GET['id'],
$_GET['person'], $_GET['person'],
$status $status
@ -86,12 +86,12 @@ switch ($action) {
break; break;
case 'delete': case 'delete':
// Delete an announcement. // Delete an announcement.
SystemAnnouncementManager :: delete_announcement($_GET['id']); SystemAnnouncementManager::delete_announcement($_GET['id']);
echo Display::return_message(get_lang('AnnouncementDeleted'), 'confirmation'); echo Display::return_message(get_lang('AnnouncementDeleted'), 'confirmation');
break; break;
case 'delete_selected': case 'delete_selected':
foreach ($_POST['id'] as $index => $id) { foreach ($_POST['id'] as $index => $id) {
SystemAnnouncementManager :: delete_announcement($id); SystemAnnouncementManager::delete_announcement($id);
} }
echo Display::return_message(get_lang('AnnouncementDeleted'), 'confirmation'); echo Display::return_message(get_lang('AnnouncementDeleted'), 'confirmation');
$action_todo = false; $action_todo = false;
@ -102,7 +102,6 @@ switch ($action) {
// Set default time window: NOW -> NEXT WEEK // Set default time window: NOW -> NEXT WEEK
$values['range_start'] = date('Y-m-d H:i:s', api_strtotime(api_get_local_time())); $values['range_start'] = date('Y-m-d H:i:s', api_strtotime(api_get_local_time()));
$values['range_end'] = date('Y-m-d H:i:s', api_strtotime(api_get_local_time()) + (7 * 24 * 60 * 60)); $values['range_end'] = date('Y-m-d H:i:s', api_strtotime(api_get_local_time()) + (7 * 24 * 60 * 60));
$values['range'] = $values['range'] =
substr(api_get_local_time(time()), 0, 16).' / '. substr(api_get_local_time(time()), 0, 16).' / '.
substr(api_get_local_time(time() + (7 * 24 * 60 * 60)), 0, 16); substr(api_get_local_time(time() + (7 * 24 * 60 * 60)), 0, 16);
@ -116,14 +115,19 @@ switch ($action) {
$values['content'] = $announcement->content; $values['content'] = $announcement->content;
$values['start'] = api_get_local_time($announcement->date_start); $values['start'] = api_get_local_time($announcement->date_start);
$values['end'] = api_get_local_time($announcement->date_end); $values['end'] = api_get_local_time($announcement->date_end);
$values['range'] =substr(api_get_local_time($announcement->date_start), 0, 16).' / '.
$values['range'] =
substr(api_get_local_time($announcement->date_start), 0, 16).' / '.
substr(api_get_local_time($announcement->date_end), 0, 16); substr(api_get_local_time($announcement->date_end), 0, 16);
$values['visible_teacher'] = $announcement->visible_teacher; $data = (array) $announcement;
foreach ($visibleToUsers as $key => $value) {
if (isset($data[$key])) {
$values[$key] = $data[$key];
}
}
/*$values['visible_teacher'] = $announcement->visible_teacher;
$values['visible_student'] = $announcement->visible_student; $values['visible_student'] = $announcement->visible_student;
$values['visible_guest'] = $announcement->visible_guest; $values['visible_guest'] = $announcement->visible_guest;*/
$values['lang'] = $announcement->lang; $values['lang'] = $announcement->lang;
$values['action'] = 'edit'; $values['action'] = 'edit';
$groups = SystemAnnouncementManager::get_announcement_groups($announcement->id); $groups = SystemAnnouncementManager::get_announcement_groups($announcement->id);
@ -171,15 +175,6 @@ if ($action_todo) {
array('id' => 'range') array('id' => 'range')
); );
$visibleToUsers = [
'visible_teacher' => get_lang('Teacher'),
'visible_student' => get_lang('Student'),
'visible_drh' => get_lang('DRH'),
'visible_session_admin' => get_lang('SessionAdministrator'),
'visible_boss' => get_lang('StudentBoss'),
'visible_guest' => get_lang('Guest')
];
$group = []; $group = [];
foreach ($visibleToUsers as $key => $name) { foreach ($visibleToUsers as $key => $name) {
$group[] = $form->createElement( $group[] = $form->createElement(
@ -207,7 +202,6 @@ if ($action_todo) {
} }
$values['group'] = isset($values['group']) ? $values['group'] : '0'; $values['group'] = isset($values['group']) ? $values['group'] : '0';
$form->addElement('checkbox', 'send_mail', null, get_lang('SendMail')); $form->addElement('checkbox', 'send_mail', null, get_lang('SendMail'));
if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'add') { if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'add') {
@ -226,16 +220,15 @@ if ($action_todo) {
$form->setDefaults($values); $form->setDefaults($values);
if ($form->validate()) { if ($form->validate()) {
$values = $form->exportValues(); $values = $form->getSubmitValues();
if (!isset($values['visible_teacher'])) { $visibilityResult = [];
$values['visible_teacher'] = false; foreach ($visibleToUsers as $key => $value) {
if (!isset($values[$key])) {
$values[$key] = false;
} }
if (!isset($values['visible_student'])) { $visibilityResult[$key] = $values[$key];
$values['visible_student'] = false;
}
if (!isset($values['visible_guest'])) {
$values['visible_guest'] = false;
} }
if ($values['lang'] == 'all') { if ($values['lang'] == 'all') {
$values['lang'] = null; $values['lang'] = null;
} }
@ -249,9 +242,7 @@ if ($action_todo) {
$values['content'], $values['content'],
$values['range_start'], $values['range_start'],
$values['range_end'], $values['range_end'],
$values['visible_teacher'], $visibilityResult,
$values['visible_student'],
$values['visible_guest'],
$values['lang'], $values['lang'],
$sendMail, $sendMail,
empty($values['add_to_calendar']) ? false : true, empty($values['add_to_calendar']) ? false : true,
@ -283,14 +274,11 @@ if ($action_todo) {
$values['content'], $values['content'],
$values['range_start'], $values['range_start'],
$values['range_end'], $values['range_end'],
$values['visible_teacher'], $visibilityResult,
$values['visible_student'],
$values['visible_guest'],
$values['lang'], $values['lang'],
$sendMail, $sendMail,
$sendMailTest $sendMailTest
) )) {
) {
if (isset($values['group'])) { if (isset($values['group'])) {
SystemAnnouncementManager::announcement_for_groups( SystemAnnouncementManager::announcement_for_groups(
$values['id'], $values['id'],
@ -326,25 +314,42 @@ if ($show_announcement_list) {
$row[] = $announcement->title; $row[] = $announcement->title;
$row[] = api_convert_and_format_date($announcement->date_start); $row[] = api_convert_and_format_date($announcement->date_start);
$row[] = api_convert_and_format_date($announcement->date_end); $row[] = api_convert_and_format_date($announcement->date_end);
$row[] = "<a href=\"?id=".$announcement->id."&person=".SystemAnnouncementManager::VISIBLE_TEACHER."&action=".($announcement->visible_teacher ? 'make_invisible' : 'make_visible')."\">".Display::return_icon(($announcement->visible_teacher ? 'eyes.png' : 'eyes-close.png'), get_lang('ShowOrHide'))."</a>";
$data = (array) $announcement;
foreach ($visibleToUsers as $key => $value) {
$value = $data[$key];
$action = $value ? 'make_invisible' : 'make_visible';
$row[] = "<a href=\"?id=".$announcement->id."&person=".$key."&action=".$action."\">".
Display::return_icon(($value ? 'eyes.png' : 'eyes-close.png'), get_lang('ShowOrHide'))."</a>";
}
/*$row[] = "<a href=\"?id=".$announcement->id."&person=".SystemAnnouncementManager::VISIBLE_TEACHER."&action=".($announcement->visible_teacher ? 'make_invisible' : 'make_visible')."\">".Display::return_icon(($announcement->visible_teacher ? 'eyes.png' : 'eyes-close.png'), get_lang('ShowOrHide'))."</a>";
$row[] = "<a href=\"?id=".$announcement->id."&person=".SystemAnnouncementManager::VISIBLE_STUDENT."&action=".($announcement->visible_student ? 'make_invisible' : 'make_visible')."\">".Display::return_icon(($announcement->visible_student ? 'eyes.png' : 'eyes-close.png'), get_lang('ShowOrHide'))."</a>"; $row[] = "<a href=\"?id=".$announcement->id."&person=".SystemAnnouncementManager::VISIBLE_STUDENT."&action=".($announcement->visible_student ? 'make_invisible' : 'make_visible')."\">".Display::return_icon(($announcement->visible_student ? 'eyes.png' : 'eyes-close.png'), get_lang('ShowOrHide'))."</a>";
$row[] = "<a href=\"?id=".$announcement->id."&person=".SystemAnnouncementManager::VISIBLE_GUEST."&action=".($announcement->visible_guest ? 'make_invisible' : 'make_visible')."\">".Display::return_icon(($announcement->visible_guest ? 'eyes.png' : 'eyes-close.png'), get_lang('ShowOrHide'))."</a>"; $row[] = "<a href=\"?id=".$announcement->id."&person=".SystemAnnouncementManager::VISIBLE_GUEST."&action=".($announcement->visible_guest ? 'make_invisible' : 'make_visible')."\">".Display::return_icon(($announcement->visible_guest ? 'eyes.png' : 'eyes-close.png'), get_lang('ShowOrHide'))."</a>";*/
$row[] = $announcement->lang; $row[] = $announcement->lang;
$row[] = "<a href=\"?action=edit&id=".$announcement->id."\">".Display::return_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL)."</a> <a href=\"?action=delete&id=".$announcement->id."\" onclick=\"javascript:if(!confirm('".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"), ENT_QUOTES))."')) return false;\">".Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL)."</a>"; $row[] = "<a href=\"?action=edit&id=".$announcement->id."\">".Display::return_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL)."</a> <a href=\"?action=delete&id=".$announcement->id."\" onclick=\"javascript:if(!confirm('".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"), ENT_QUOTES))."')) return false;\">".Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL)."</a>";
$announcement_data[] = $row; $announcement_data[] = $row;
} }
$table = new SortableTableFromArray($announcement_data); $table = new SortableTableFromArray($announcement_data);
$table->set_header(0, '', false); $table->set_header(0, '', false, 'width="20px"');
$table->set_header(1, get_lang('Active')); $table->set_header(1, get_lang('Active'));
$table->set_header(2, get_lang('Title')); $table->set_header(2, get_lang('Title'));
$table->set_header(3, get_lang('StartTimeWindow')); $table->set_header(3, get_lang('StartTimeWindow'));
$table->set_header(4, get_lang('EndTimeWindow')); $table->set_header(4, get_lang('EndTimeWindow'));
$table->set_header(5, get_lang('Teacher'));
$table->set_header(6, get_lang('Student'));
$table->set_header(7, get_lang('Guest'));
$table->set_header(8, get_lang('Language')); $count = 5;
$table->set_header(9, get_lang('Modify'), false, 'width="50px"'); foreach ($visibleToUsers as $key => $value) {
$table->set_header($count, $value);
$count++;
}
//$table->set_header(5, get_lang('Teacher'));
//$table->set_header(6, get_lang('Student'));
//$table->set_header(7, get_lang('Guest'));
$table->set_header($count++, get_lang('Language'));
$table->set_header($count++, get_lang('Modify'), false, 'width="50px"');
$form_actions = array(); $form_actions = array();
$form_actions['delete_selected'] = get_lang('Delete'); $form_actions['delete_selected'] = get_lang('Delete');
$table->set_form_actions($form_actions); $table->set_form_actions($form_actions);

117
main/inc/lib/system_announcements.lib.php
Unescape View File

@ -298,9 +298,7 @@ class SystemAnnouncementManager
* @param string $content Content of the announcement * @param string $content Content of the announcement
* @param string $date_start Start date (YYYY-MM-DD HH:II: SS) * @param string $date_start Start date (YYYY-MM-DD HH:II: SS)
* @param string $date_end End date (YYYY-MM-DD HH:II: SS) * @param string $date_end End date (YYYY-MM-DD HH:II: SS)
* @param int $visible_teacher Whether the announcement should be visible to teachers (1) or not (0) * @param array $visibility
* @param int $visible_student Whether the announcement should be visible to students (1) or not (0)
* @param int $visible_guest Whether the announcement should be visible to anonymous users (1) or not (0)
* @param string $lang The language for which the announvement should be shown. Leave null for all langages * @param string $lang The language for which the announvement should be shown. Leave null for all langages
* @param int $send_mail Whether to send an e-mail to all users (1) or not (0) * @param int $send_mail Whether to send an e-mail to all users (1) or not (0)
* @param bool $add_to_calendar * @param bool $add_to_calendar
@ -313,9 +311,7 @@ class SystemAnnouncementManager
$content, $content,
$date_start, $date_start,
$date_end, $date_end,
$visible_teacher = 0, $visibility,
$visible_student = 0,
$visible_guest = 0,
$lang = '', $lang = '',
$send_mail = 0, $send_mail = 0,
$add_to_calendar = false, $add_to_calendar = false,
@ -376,13 +372,14 @@ class SystemAnnouncementManager
'content' => $content, 'content' => $content,
'date_start' => $start, 'date_start' => $start,
'date_end' => $end, 'date_end' => $end,
'visible_teacher' => $visible_teacher,
'visible_student' => $visible_student,
'visible_guest' => $visible_guest,
'lang' => $lang, 'lang' => $lang,
'access_url_id' => $current_access_url_id 'access_url_id' => $current_access_url_id
]; ];
foreach ($visibility as $key => $value) {
$params[$key] = $value;
}
$resultId = Database::insert($db_table, $params); $resultId = Database::insert($db_table, $params);
if ($resultId) { if ($resultId) {
@ -390,8 +387,7 @@ class SystemAnnouncementManager
self::send_system_announcement_by_email( self::send_system_announcement_by_email(
$title, $title,
$content, $content,
$visible_teacher, $visibility,
$visible_student,
$lang, $lang,
true true
); );
@ -400,8 +396,7 @@ class SystemAnnouncementManager
self::send_system_announcement_by_email( self::send_system_announcement_by_email(
$title, $title,
$content, $content,
$visible_teacher, $visibility,
$visible_student,
$lang $lang
); );
} }
@ -487,11 +482,13 @@ class SystemAnnouncementManager
/** /**
* Updates an announcement to the database * Updates an announcement to the database
* @param integer $id : id of the announcement *
* @param string $title : title of the announcement * @param integer $id of the announcement
* @param string $content : content of the announcement * @param string $title title of the announcement
* @param array $date_start: start date of announcement (0 => day ; 1 => month ; 2 => year ; 3 => hour ; 4 => minute) * @param string $content content of the announcement
* @param array $date_end : end date of announcement (0 => day ; 1 => month ; 2 => year ; 3 => hour ; 4 => minute) * @param array $date_start start date (0 => day ; 1 => month ; 2 => year ; 3 => hour ; 4 => minute)
* @param array $date_end end date of (0 => day ; 1 => month ; 2 => year ; 3 => hour ; 4 => minute)
* @param array $visibility
* @return bool True on success, false on failure * @return bool True on success, false on failure
*/ */
public static function update_announcement( public static function update_announcement(
@ -500,16 +497,13 @@ class SystemAnnouncementManager
$content, $content,
$date_start, $date_start,
$date_end, $date_end,
$visible_teacher = 0, $visibility,
$visible_student = 0,
$visible_guest = 0,
$lang = null, $lang = null,
$send_mail = 0, $send_mail = 0,
$sendEmailTest = false $sendEmailTest = false
) { ) {
$em = Database::getManager(); $em = Database::getManager();
$announcement = $em->find('ChamiloCoreBundle:SysAnnouncement', $id); $announcement = $em->find('ChamiloCoreBundle:SysAnnouncement', $id);
if (!$announcement) { if (!$announcement) {
return false; return false;
} }
@ -557,6 +551,10 @@ class SystemAnnouncementManager
$content = str_replace('src=\"'.api_get_path(REL_HOME_PATH), 'src=\"'.api_get_path(WEB_PATH).api_get_path(REL_HOME_PATH), $content); $content = str_replace('src=\"'.api_get_path(REL_HOME_PATH), 'src=\"'.api_get_path(WEB_PATH).api_get_path(REL_HOME_PATH), $content);
$content = str_replace('file='.api_get_path(REL_HOME_PATH), 'file='.api_get_path(WEB_PATH).api_get_path(REL_HOME_PATH), $content); $content = str_replace('file='.api_get_path(REL_HOME_PATH), 'file='.api_get_path(WEB_PATH).api_get_path(REL_HOME_PATH), $content);
$visible_teacher = $visibility['visible_teacher'];
$visible_student = $visibility['visible_student'];
$visible_guest = $visibility['visible_guest'];
if ($sendEmailTest) { if ($sendEmailTest) {
self::send_system_announcement_by_email( self::send_system_announcement_by_email(
$title, $title,
@ -587,14 +585,22 @@ class SystemAnnouncementManager
->setContent($content) ->setContent($content)
->setDateStart($dateStart) ->setDateStart($dateStart)
->setDateEnd($dateEnd) ->setDateEnd($dateEnd)
->setVisibleTeacher($visible_teacher) //->setVisibleTeacher($visible_teacher)
->setVisibleStudent($visible_student) //->setVisibleStudent($visible_student)
->setVisibleGuest($visible_guest) //->setVisibleGuest($visible_guest)
->setAccessUrlId(api_get_current_access_url_id()); ->setAccessUrlId(api_get_current_access_url_id());
$em->merge($announcement); $em->merge($announcement);
$em->flush(); $em->flush();
// Update visibility
$list = self::getVisibilityList();
$table = Database::get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
foreach ($list as $key => $title) {
$value = isset($visibility[$key]) && $visibility[$key] ? 1 : 0;
$sql = "UPDATE $table SET $key = '$value' WHERE id = $id";
Database::query($sql);
}
return true; return true;
} }
@ -605,9 +611,9 @@ class SystemAnnouncementManager
*/ */
public static function delete_announcement($id) public static function delete_announcement($id)
{ {
$db_table = Database::get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS); $table = Database::get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
$id = intval($id); $id = intval($id);
$sql = "DELETE FROM ".$db_table." WHERE id =".$id; $sql = "DELETE FROM $table WHERE id =".$id;
$res = Database::query($sql); $res = Database::query($sql);
if ($res === false) { if ($res === false) {
return false; return false;
@ -632,25 +638,25 @@ class SystemAnnouncementManager
/** /**
* Change the visibility of an announcement * Change the visibility of an announcement
* @param int $announcement_id * @param int $id
* @param int $user For who should the visibility be changed * @param int $user For who should the visibility be changed
* @param int $visible
* (possible values are VISIBLE_TEACHER, VISIBLE_STUDENT, VISIBLE_GUEST) * (possible values are VISIBLE_TEACHER, VISIBLE_STUDENT, VISIBLE_GUEST)
* @return bool True on success, false on failure * @return bool True on success, false on failure
*/ */
public static function set_visibility($announcement_id, $user, $visible) public static function set_visibility($id, $user, $visible)
{ {
$db_table = Database::get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS); $table = Database::get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
$visible = intval($visible); $id = (int) $id;
$announcement_id = intval($announcement_id); $list = array_keys(self::getVisibilityList());
$user = trim($user);
if (!in_array($user, array(self::VISIBLE_GUEST, self::VISIBLE_STUDENT, self::VISIBLE_TEACHER))) { if (!in_array($user, $list)) {
return false; return false;
} }
$field = ($user == self::VISIBLE_TEACHER ? 'visible_teacher' : ($user == self::VISIBLE_STUDENT ? 'visible_student' : 'visible_guest')); $field = $user;
$sql = "UPDATE $table SET ".$field." = '".$visible."'
$sql = "UPDATE ".$db_table." SET ".$field." = '".$visible."' WHERE id='".$id."'";
WHERE id='".$announcement_id."'";
$res = Database::query($sql); $res = Database::query($sql);
if ($res === false) { if ($res === false) {
@ -660,12 +666,37 @@ class SystemAnnouncementManager
return true; return true;
} }
/**
* @return array
*/
public static function getVisibilityList()
{
$extraRoles = api_get_configuration_value('system_announce_extra_roles');
/* Requires DB change:
ALTER TABLE sys_announcement ADD COLUMN visible_drh INT DEFAULT 0;
ALTER TABLE sys_announcement ADD COLUMN visible_session_admin INT DEFAULT 0;
ALTER TABLE sys_announcement ADD COLUMN visible_boss INT DEFAULT 0;
*/
$visibleToUsers = [
'visible_teacher' => get_lang('Teacher'),
'visible_student' => get_lang('Student'),
'visible_guest' => get_lang('Guest')
];
if ($extraRoles) {
$visibleToUsers['visible_drh'] = get_lang('DRH');
$visibleToUsers['visible_session_admin'] = get_lang('SessionAdministrator');
$visibleToUsers['visible_boss'] = get_lang('StudentBoss');
}
return $visibleToUsers;
}
/** /**
* Send a system announcement by e-mail to all teachers/students depending on parameters * Send a system announcement by e-mail to all teachers/students depending on parameters
* @param string $title * @param string $title
* @param string $content * @param string $content
* @param int $teacher Whether to send to all teachers (1) or not (0) * @param array $visibility
* @param int $student Whether to send to all students (1) or not (0)
* @param string $language Language (optional, considered for all languages if left empty) * @param string $language Language (optional, considered for all languages if left empty)
* @param bool $sendEmailTest * @param bool $sendEmailTest
* @return bool True if the message was sent or there was no destination matching. False on database or e-mail sending error. * @return bool True if the message was sent or there was no destination matching. False on database or e-mail sending error.
@ -673,14 +704,14 @@ class SystemAnnouncementManager
public static function send_system_announcement_by_email( public static function send_system_announcement_by_email(
$title, $title,
$content, $content,
$teacher, $visibility,
$student,
$language = null, $language = null,
$sendEmailTest = false $sendEmailTest = false
) { ) {
$content = str_replace(array('\r\n', '\n', '\r'), '', $content); $content = str_replace(array('\r\n', '\n', '\r'), '', $content);
$now = api_get_utc_datetime(); $now = api_get_utc_datetime();
$teacher = $visibility['visible_teacher'];
$student = $visibility['visible_student'];
if ($sendEmailTest) { if ($sendEmailTest) {
MessageManager::send_message_simple(api_get_user_id(), $title, $content); MessageManager::send_message_simple(api_get_user_id(), $title, $content);

2
main/install/configuration.dist.php
Unescape View File

@ -371,3 +371,5 @@ $_configuration['agenda_legend'] = [
//$_configuration['session_list_show_count_users'] = false; //$_configuration['session_list_show_count_users'] = false;
// Session admin access to all course content // Session admin access to all course content
//$_configuration['session_admins_access_all_content'] = false; //$_configuration['session_admins_access_all_content'] = false;
// Adds roles to the system announcements (requires DB change BT#12476)
//$_configuration['system_announce_extra_roles'] = false;

Write Preview
Loading…
Cancel
Save