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. 42
      main/admin/system_announcements.php
  2. 115
      main/inc/lib/system_announcements.lib.php

42
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 = "";
@ -136,7 +127,7 @@ if (isset ($_POST['action']) && $_POST['action'] == 'delete_selected')
{
foreach($_POST['id'] as $index => $id)
{
SystemAnnouncementManager :: delete_announcement($id);
SystemAnnouncementManager :: delete_announcement($id);
}
Display :: display_normal_message(get_lang('AnnouncementDeleted'));
$action_todo = false;
@ -173,14 +164,15 @@ 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];
}
$fck_attribute['Width'] = '600';
$fck_attribute['Height'] = '400';
$fck_attribute['ToolbarSet'] = 'Middle';
$form->addElement('select', 'lang',get_lang('Language'),$language_list_with_keys);
$form->add_html_editor('content', get_lang('Content'));
$form->add_timewindow('start','end',get_lang('StartTimeWindow'),get_lang('EndTimeWindow'));
@ -196,15 +188,19 @@ if ($action_todo)
$values = $form->exportValues();
if( !isset($values['visible_teacher']))
{
$values['visible_teacher'] = false;
$values['visible_teacher'] = false;
}
if( !isset($values['visible_student']))
{
$values['visible_student'] = false;
$values['visible_student'] = false;
}
if( !isset($values['visible_guest']))
{
$values['visible_guest'] = false;
$values['visible_guest'] = false;
}
if($values['lang'] == 'all')
{
$values['lang'] = null;
}
switch($values['action'])
{
@ -224,7 +220,7 @@ if ($action_todo)
$form->display();
}
break;
default:
default:
break;
}
$show_announcement_list = true;
@ -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);
@ -270,7 +268,7 @@ if ($show_announcement_list)
}
/*
==============================================================================
FOOTER
FOOTER
==============================================================================
*/
Display :: display_footer();

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

@ -1,40 +1,40 @@
<?php
/*
==============================================================================
==============================================================================
Dokeos - elearning and course management software
Copyright (c) 2004 Dokeos S.A.
Copyright (c) 2003 Ghent University (UGent)
Copyright (c) 2001 Universite catholique de Louvain (UCL)
Copyright (c) 2004 Bart Mollet (HoGent)
For a full list of contributors, see "credits.txt".
The full license can be read in "license.txt".
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
See the GNU General Public License for more details.
Contact address: Dokeos, 44 rue des palais, B-1030 Brussels, Belgium
Mail: info@dokeos.com
==============================================================================
==============================================================================
*/
define('VISIBLE_GUEST', 1);
define('VISIBLE_STUDENT', 2);
define('VISIBLE_TEACHER', 3);
/**
==============================================================================
==============================================================================
* This is the system announcements library for Dokeos.
*
* @package dokeos.library
==============================================================================
==============================================================================
*/
class SystemAnnouncementManager
{
/**
/**
* Displays all announcements
* @param int $visible VISIBLE_GUEST, VISIBLE_STUDENT or VISIBLE_TEACHER
* @param int $id The identifier of the announcement to display
@ -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 :
@ -58,7 +58,7 @@ class SystemAnnouncementManager
break;
}
$sql .= " ORDER BY date_start DESC LIMIT 0,7";
$announcements = api_sql_query($sql,__FILE__,__LINE__);
if (mysql_num_rows($announcements))
{
@ -70,7 +70,7 @@ class SystemAnnouncementManager
echo '<table border="0">';
while ($announcement = mysql_fetch_object($announcements))
{
if ($id != $announcement->id)
{
if (strlen($query_string) > 0)
@ -96,16 +96,16 @@ class SystemAnnouncementManager
{
echo '<div class="system_announcement">
<div class="system_announcement_title">'
.$announcement->display_date.'
.$announcement->display_date.'
<a name="ann'.$announcement->id.'" href="'.$url.'?'.$query_string.'#ann'.$announcement->id.'">'.$announcement->title.'</a>
</div>
<div class="system_announcement_content">'
.$announcement->content.'
</div>';
}
}
echo '<tr><td height="15px"></td></tr>';
echo '<tr><td colspan="2">';
echo '<a href="newsList.php">'.get_lang("More").'</a>';
@ -115,17 +115,17 @@ class SystemAnnouncementManager
}
return;
}
function display_all_announcements($visible, $id = -1,$start = 0,$user_id)
{
{
$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)
$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 :
@ -138,7 +138,7 @@ class SystemAnnouncementManager
$sql .= " AND visible_teacher = 'true'";
break;
}
if(!isset($_GET['start']) || $_GET['start'] == 0)
{
$sql .= " ORDER BY date_start DESC LIMIT ".$start.",20";
@ -148,7 +148,7 @@ class SystemAnnouncementManager
$sql .= " ORDER BY date_start DESC LIMIT ".($start+1).",20";
}
$announcements = api_sql_query($sql,__FILE__,__LINE__);
if (mysql_num_rows($announcements))
{
$query_string = ereg_replace('announcement=[1-9]+', '', $_SERVER['QUERY_STRING']);
@ -193,46 +193,46 @@ class SystemAnnouncementManager
}
return;
}
function display_fleche($user_id)
{
$start = (int)$_GET['start'];
$nb_announcement = SystemAnnouncementManager :: count_nb_announcement($start,$user_id);
$next = ((int)$_GET['start']+19);
$prev = ((int)$_GET['start']-19);
if(!isset($_GET['start']) || $_GET['start'] == 0)
{
if($nb_announcement > 20)
{
echo '<a href="newsList.php?start='.$next.'">'.get_lang('NextBis').' >> </a>';
}
}
else
{
echo '<a href="newsList.php?start='.$prev.'"> << '.get_lang('Prev').'</a>';
if($nb_announcement > 20)
{
echo '<a href="newsList.php?start='.$next.'">'.get_lang('NextBis').' >> </a>';
}
}
}
function count_nb_announcement($start = 0,$user_id = '')
{
$visibility = api_is_allowed_to_create_course() ? VISIBLE_TEACHER : VISIBLE_STUDENT;
$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 id
$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)
{
case VISIBLE_GUEST :
@ -255,24 +255,17 @@ class SystemAnnouncementManager
}
return $i;
}
/**
* Get all announcements
* @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,43 +281,43 @@ 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);
$a_arraySD = explode('-',$a_dateS[0]);
$a_arraySH = explode(':',$a_dateS[1]);
$date_start = array_merge($a_arraySD,$a_arraySH);
$a_dateE = explode(' ',$date_end);
$a_arrayED = explode('-',$a_dateE[0]);
$a_arrayEH = explode(':',$a_dateE[1]);
$date_end = array_merge($a_arrayED,$a_arrayEH);
$db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
if (!checkdate($date_start[1], $date_start[2], $date_start[0]))
{
Display :: display_normal_message(get_lang('InvalidStartDate'));
return false;
}
if (($date_end[1] || $date_end[2] || $date_end[0]) && !checkdate($date_end[1], $date_end[2], $date_end[0]))
{
{
Display :: display_normal_message(get_lang('InvalidEndDate'));
return false;
}
if( strlen(trim($title)) == 0)
{
Display::display_normal_message(get_lang('InvalidTitle'));
return false;
return false;
}
$start = $date_start[0]."-".$date_start[1]."-".$date_start[2]." ".$date_start[3].":".$date_start[4].":".$date_start[5];
$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);
$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."')";
$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.")";
return api_sql_query($sql,__FILE__,__LINE__);
}
/**
@ -337,17 +330,17 @@ class SystemAnnouncementManager
*/
function update_announcement($id, $title, $content, $date_start, $date_end, $visible_teacher = 'false', $visible_student = 'false', $visible_guest = 'false',$lang='dutch')
{
$a_dateS = explode(' ',$date_start);
$a_arraySD = explode('-',$a_dateS[0]);
$a_arraySH = explode(':',$a_dateS[1]);
$date_start = array_merge($a_arraySD,$a_arraySH);
$a_dateE = explode(' ',$date_end);
$a_arrayED = explode('-',$a_dateE[0]);
$a_arrayEH = explode(':',$a_dateE[1]);
$date_end = array_merge($a_arrayED,$a_arrayEH);
$db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
if (!checkdate($date_start[1], $date_start[2], $date_start[0]))
{
@ -355,14 +348,14 @@ if (!checkdate($date_start[1], $date_start[2], $date_start[0]))
return false;
}
if (($date_end[1] || $date_end[2] || $date_end[0]) && !checkdate($date_end[1], $date_end[2], $date_end[0]))
{
{
Display :: display_normal_message(get_lang('InvalidEndDate'));
return false;
}
if( strlen(trim($title)) == 0)
{
Display::display_normal_message(get_lang('InvalidTitle'));
return false;
return false;
}
$start = $date_start[0]."-".$date_start[1]."-".$date_start[2]." ".$date_start[3].":".$date_start[4].":".$date_start[5];
$end = $date_end[0]."-".$date_end[1]."-".$date_end[2]." ".$date_end[3].":".$date_end[4].":".$date_start[5];

Write Preview
Loading…
Cancel
Save