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

[svn r10667] Allow submission of system announcements for ALL languages

Browse Source 
http://www.dokeos.com/forum/viewtopic.php?t=8228
skala
Bart Mollet 19 years ago
parent d39f4aef7a
commit a1ae226688
2 changed files with 74 additions and 83 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. 26
      main/admin/system_announcements.php
  2. 23
      main/inc/lib/system_announcements.lib.php

26
main/admin/system_announcements.php
Unescape View File

@ -1,5 +1,5 @@
<?php
// $Id: system_announcements.php 10479 2006-12-13 12:42:20Z elixir_inter $
// $Id: system_announcements.php 10667 2007-01-11 09:36:29Z bmol $
/*
==============================================================================
Dokeos - elearning and course management software
@ -73,17 +73,8 @@ Display :: display_header($tool_name);
==============================================================================
*/
if($_GET['action'] != 'add' && $_GET['action'] != 'edit'){
$form = new FormValidator('languagechange','GET');
$language_list = api_get_languages();
$language_list_with_keys = array();
for($i=0; $i<count($language_list['name']) ; $i++) {
$language_list_with_keys[$language_list['folder'][$i]] = $language_list['name'][$i];
}
$form->addElement('select', 'lang',get_lang('Language'),$language_list_with_keys);
$form->addElement('submit', 'submit', get_lang('Ok'));
$form->display();
if($_GET['action'] != 'add' && $_GET['action'] != 'edit')
{
echo '<a href="?action=add">'.get_lang('AddAnnouncement').'</a>';
}
$form_action = "";
@ -173,6 +164,7 @@ if ($action_todo)
$form->add_textfield('title', get_lang('Title'));
$language_list = api_get_languages();
$language_list_with_keys = array();
$language_list_with_keys['all'] = get_lang('All');
for($i=0; $i<count($language_list['name']) ; $i++) {
$language_list_with_keys[$language_list['folder'][$i]] = $language_list['name'][$i];
}
@ -206,6 +198,10 @@ if ($action_todo)
{
$values['visible_guest'] = false;
}
if($values['lang'] == 'all')
{
$values['lang'] = null;
}
switch($values['action'])
{
case 'add':
@ -237,7 +233,7 @@ if ($action_todo)
}
if ($show_announcement_list)
{
$announcements = SystemAnnouncementManager :: get_all_announcements($_GET['lang']);
$announcements = SystemAnnouncementManager :: get_all_announcements();
$announcement_data = array ();
foreach ($announcements as $index => $announcement)
{
@ -250,6 +246,7 @@ if ($show_announcement_list)
$row[] = "<a href=\"?id=".$announcement->id."&amp;person=".VISIBLE_STUDENT."&amp;action=". ($announcement->visible_student ? 'make_invisible' : 'make_visible')."\"><img src=\"../img/". ($announcement->visible_student ? 'visible.gif' : 'invisible.gif')."\" border=\"0\"></a>";
$row[] = "<a href=\"?id=".$announcement->id."&amp;person=".VISIBLE_GUEST."&amp;action=". ($announcement->visible_guest ? 'make_invisible' : 'make_visible')."\"><img src=\"../img/". ($announcement->visible_guest ? 'visible.gif' : 'invisible.gif')."\" border=\"0\"></a>";
$row[] = $announcement->title;
$row[] = $announcement->lang;
$row[] = "<a href=\"?action=edit&id=".$announcement->id."\"><img src=\"../img/edit.gif\" border=\"0\"/></a> <a href=\"?action=delete&id=".$announcement->id."\" onclick=\"javascript:if(!confirm('".addslashes(htmlentities(get_lang("ConfirmYourChoice")))."')) return false;\"><img src=\"../img/delete.gif\" border=\"0\"/></a>";
$announcement_data[] = $row;
}
@ -262,7 +259,8 @@ if ($show_announcement_list)
$table->set_header(5,get_lang('Student'));
$table->set_header(6,get_lang('Guest'));
$table->set_header(7,get_lang('Title'));
$table->set_header(8,get_lang('Modify'), false);
$table->set_header(8,get_lang('Language'));
$table->set_header(9,get_lang('Modify'), false);
$form_actions = array();
$form_actions['delete_selected'] = get_lang('Delete');
$table->set_form_actions($form_actions);

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

@ -44,7 +44,7 @@ class SystemAnnouncementManager
$user_selected_language = $_SESSION["user_language_choice"] ? $_SESSION["user_language_choice"] : get_setting('platformLanguage');
$db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
$sql = "SELECT *, DATE_FORMAT(date_start,'%d-%m-%Y') AS display_date FROM ".$db_table." WHERE lang='$user_selected_language' AND (NOW() BETWEEN date_start AND date_end) OR date_end='0000-00-00' ";
$sql = "SELECT *, DATE_FORMAT(date_start,'%d-%m-%Y') AS display_date FROM ".$db_table." WHERE (lang='$user_selected_language' OR lang IS NULL) AND (NOW() BETWEEN date_start AND date_end) OR date_end='0000-00-00' ";
switch ($visible)
{
case VISIBLE_GUEST :
@ -123,7 +123,7 @@ class SystemAnnouncementManager
$db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
$sql = "SELECT *, DATE_FORMAT(date_start,'%d-%m-%Y') AS display_date FROM ".$db_table."
WHERE lang='$user_selected_language' AND (NOW() BETWEEN date_start AND date_end)
WHERE (lang='$user_selected_language' OR lang IS NULL) AND (NOW() BETWEEN date_start AND date_end)
OR date_end='0000-00-00'";
switch ($visible)
@ -230,7 +230,7 @@ class SystemAnnouncementManager
$db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
$sql = 'SELECT id
FROM '.$db_table.'
WHERE lang="'.$user_selected_language.'"';
WHERE (lang="'.$user_selected_language.'" OR lang IS NULL) ';
if (isset($user_id))
{
switch ($visibility)
@ -261,18 +261,11 @@ class SystemAnnouncementManager
* @return array An array with all available system announcements (as php
* objects)
*/
function get_all_announcements($lang)
function get_all_announcements()
{
$db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
$where="";
if(!empty($lang))
{
$where="WHERE lang='$lang'";
}
$sql = "SELECT *, IF( NOW() BETWEEN date_start AND date_end, '1', '0') AS visible FROM ".$db_table." $where ORDER BY date_start ASC";
$sql = "SELECT *, IF( NOW() BETWEEN date_start AND date_end, '1', '0') AS visible FROM ".$db_table." ORDER BY date_start ASC";
$announcements = api_sql_query($sql,__FILE__,__LINE__);
$all_announcements = array();
while ($announcement = mysql_fetch_object($announcements))
@ -288,7 +281,7 @@ class SystemAnnouncementManager
* @param string $date_start Start date (YYYY-MM-DD HH:II: SS)
* @param string $date_end End date (YYYY-MM-DD HH:II: SS)
*/
function add_announcement($title, $content, $date_start, $date_end, $visible_teacher = 'false', $visible_student = 'false', $visible_guest = 'false', $lang = 'dutch')
function add_announcement($title, $content, $date_start, $date_end, $visible_teacher = 'false', $visible_student = 'false', $visible_guest = 'false', $lang = null)
{
$a_dateS = explode(' ',$date_start);
@ -322,9 +315,9 @@ class SystemAnnouncementManager
$end = $date_end[0]."-".$date_end[1]."-".$date_end[2]." ".$date_end[3].":".$date_end[4].":".$date_start[5];
$title = mysql_real_escape_string($title);
$content = mysql_real_escape_string($content);
$lang = is_null($lang) ? 'NULL' : "\'".mysql_real_escape_string($lang)."\'";
$sql = "INSERT INTO ".$db_table." (`title`,`content`,`date_start`,`date_end`,`visible_teacher`,`visible_student`,`visible_guest`, `lang`)
VALUES ('".$title."','".$content."','".$start."','".$end."','".$visible_teacher."','".$visible_student."','".$visible_guest."','".$lang."')";
VALUES ('".$title."','".$content."','".$start."','".$end."','".$visible_teacher."','".$visible_student."','".$visible_guest."',".$lang.")";
return api_sql_query($sql,__FILE__,__LINE__);
}
/**

Write Preview
Loading…
Cancel
Save