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

Minor - format code.

Browse Source
1.9.x
Julio Montoya 11 years ago
parent 36f895a7e8
commit 8866307764
3 changed files with 22 additions and 16 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. 22
      main/admin/system_announcements.php
  2. 8
      main/inc/lib/message.lib.php
  3. 8
      main/inc/lib/system_announcements.lib.php

22
main/admin/system_announcements.php
Unescape View File

@ -40,10 +40,10 @@ if (isset($_GET['action'])) {
$interbreadcrumb[] = array ("url" => "system_announcements.php", "name" => get_lang('SystemAnnouncements'));
if ($_GET['action'] == 'add') {
$interbreadcrumb[] = array ("url" => '#', "name" => get_lang('AddAnnouncement'));
}
}
if ($_GET['action'] == 'edit') {
$interbreadcrumb[] = array ("url" => '#', "name" => get_lang('Edit'));
}
}
} else {
$tool_name = get_lang('SystemAnnouncements');
}
@ -82,7 +82,7 @@ switch($action) {
SystemAnnouncementManager :: delete_announcement($_GET['id']);
Display :: display_confirmation_message(get_lang('AnnouncementDeleted'));
break;
case 'delete_selected':
foreach($_POST['id'] as $index => $id) {
SystemAnnouncementManager :: delete_announcement($id);
@ -141,13 +141,13 @@ if ($action_todo) {
}
$form->add_timewindow('start','end',get_lang('StartTimeWindow'),get_lang('EndTimeWindow'));
$group = array();
$group[]= $form->createElement('checkbox', 'visible_teacher', null, get_lang('Teacher'));
$group[]= $form->createElement('checkbox', 'visible_student', null, get_lang('Student'));
$group[]= $form->createElement('checkbox', 'visible_guest', null, get_lang('Guest'));
$form->addGroup($group, null, get_lang('Visible'), '');
$form->addElement('hidden', 'id');
$group_list = GroupPortalManager::get_groups_list();
@ -155,7 +155,7 @@ if ($action_todo) {
$form->addElement('select', 'group',get_lang('AnnouncementForGroup'),$group_list);
$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') {
$form->addElement('checkbox', 'add_to_calendar', null, get_lang('AddToCalendar'));
@ -189,7 +189,7 @@ if ($action_todo) {
$values['lang'] = null;
}
if (api_get_setting('wcag_anysurfer_public_pages') == 'true') {
$values['content'] = WCAG_Rendering::text_to_HTML($values['content']);
//$values['content'] = WCAG_Rendering::text_to_HTML($values['content']);
}
switch ($values['action']) {
case 'add':
@ -234,13 +234,13 @@ if ($show_announcement_list) {
$row = array();
$row[] = $announcement->id;
$row[] = Display::return_icon(($announcement->visible ? 'accept.png' : 'exclamation.png'), ($announcement->visible ? get_lang('AnnouncementAvailable') : get_lang('AnnouncementNotAvailable')));
$row[] = $announcement->title;
$row[] = $announcement->title;
$row[] = api_convert_and_format_date($announcement->date_start);
$row[] = api_convert_and_format_date($announcement->date_end);
$row[] = "<a href=\"?id=".$announcement->id."&amp;person=".SystemAnnouncementManager::VISIBLE_TEACHER."&amp;action=". ($announcement->visible_teacher ? 'make_invisible' : 'make_visible')."\">".Display::return_icon(($announcement->visible_teacher ? 'visible.gif' : 'invisible.gif'), get_lang('ShowOrHide'))."</a>";
$row[] = "<a href=\"?id=".$announcement->id."&amp;person=".SystemAnnouncementManager::VISIBLE_STUDENT."&amp;action=". ($announcement->visible_student ? 'make_invisible' : 'make_visible')."\">".Display::return_icon(($announcement->visible_student ? 'visible.gif' : 'invisible.gif'), get_lang('ShowOrHide'))."</a>";
$row[] = "<a href=\"?id=".$announcement->id."&amp;person=".SystemAnnouncementManager::VISIBLE_GUEST."&amp;action=". ($announcement->visible_guest ? 'make_invisible' : 'make_visible')."\">".Display::return_icon(($announcement->visible_guest ? 'visible.gif' : 'invisible.gif'), get_lang('ShowOrHide'))."</a>";
$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>";
$announcement_data[] = $row;
@ -254,7 +254,7 @@ if ($show_announcement_list) {
$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'));
$table->set_header(9, get_lang('Modify'), false, 'width="50px"');
$form_actions = array();

8
main/inc/lib/message.lib.php
Unescape View File

@ -313,7 +313,13 @@ class MessageManager
$sender_info = api_get_user_info($user_sender_id);
if (empty($group_id)) {
$notification->save_notification(Notification::NOTIFICATION_TYPE_MESSAGE, array($receiver_user_id), $subject, $content, $sender_info);
$notification->save_notification(
Notification::NOTIFICATION_TYPE_MESSAGE,
array($receiver_user_id),
$subject,
$content,
$sender_info
);
} else {
$group_info = GroupPortalManager::get_group_data($group_id);
$group_info['topic_id'] = $topic_id;

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

@ -318,7 +318,7 @@ class SystemAnnouncementManager {
Display :: display_normal_message(get_lang('InvalidEndDate'));
return false;
}
if( strlen(trim($title)) == 0) {
if (strlen(trim($title)) == 0) {
Display::display_normal_message(get_lang('InvalidTitle'));
return false;
}
@ -566,8 +566,8 @@ class SystemAnnouncementManager {
return false;
}
$title = api_html_entity_decode(stripslashes($title), ENT_QUOTES, $charset);
$content = api_html_entity_decode(stripslashes(str_replace(array('\r\n', '\n', '\r'),'', $content)), ENT_QUOTES, $charset);
$title = api_html_entity_decode(stripslashes($title), ENT_QUOTES, $charset);
$content = api_html_entity_decode(stripslashes(str_replace(array('\r\n', '\n', '\r'),'', $content)), ENT_QUOTES, $charset);
$message_sent = false;
@ -636,4 +636,4 @@ class SystemAnnouncementManager {
}
return $html;
}
}
}

Write Preview
Loading…
Cancel
Save