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

Fix glossary messages + format code

Browse Source
ofaj
jmontoyaa 9 years ago
parent b0ff969fc7
commit 372acb3054
2 changed files with 307 additions and 256 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. 397
      main/glossary/index.php
  2. 166
      main/inc/lib/glossary.lib.php

397
main/glossary/index.php
Unescape View File

@ -1,6 +1,8 @@
<?php <?php
/* For licensing terms, see /license.txt */ /* For licensing terms, see /license.txt */
use ChamiloSession as Session;
/** /**
* @package chamilo.glossary * @package chamilo.glossary
* @author Christian Fasanando, initial version * @author Christian Fasanando, initial version
@ -9,7 +11,7 @@
require_once '../inc/global.inc.php'; require_once '../inc/global.inc.php';
$current_course_tool = TOOL_GLOSSARY; $current_course_tool = TOOL_GLOSSARY;
// The section (tabs). // The section (tabs).
$this_section = SECTION_COURSES; $this_section = SECTION_COURSES;
@ -27,243 +29,262 @@ $(document).ready(function () {
setFocus(); setFocus();
}); });
</script>'; </script>';
// setting the tool constants
$tool = TOOL_GLOSSARY;
// Tracking // Tracking
Event::event_access_tool(TOOL_GLOSSARY); Event::event_access_tool(TOOL_GLOSSARY);
function sorter($item1, $item2) { function sorter($item1, $item2) {
if ($item1[2] == $item2[2]) if ($item1[2] == $item2[2]) {
return 0; return 0;
return $item1[2] < $item2[2] ? -1 : 1; }
return $item1[2] < $item2[2] ? -1 : 1;
} }
// Displaying the header // Displaying the header
$action = isset($_GET['action']) ? $_GET['action'] : null; $action = isset($_GET['action']) ? $_GET['action'] : '';
$currentUrl = api_get_self().'?'.api_get_cidreq();
$tool = 'GlossaryManagement'; $interbreadcrumb[] = array('url' => 'index.php?'.api_get_cidreq(), 'name' => get_lang('Glossary'));
$interbreadcrumb[] = array ("url"=>"index.php", "name"=> get_lang('Glossary'));
if (!empty($action)) {
} $content = '';
$tool_name = '';
switch ($action) { switch ($action) {
case 'addglossary': case 'addglossary':
if (!api_is_allowed_to_edit(null, true)) {
api_not_allowed(true);
}
$tool_name = get_lang('Add'); $tool_name = get_lang('Add');
$form = new FormValidator(
'glossary',
'post',
api_get_self().'?action='.Security::remove_XSS($_GET['action']).'&'.api_get_cidreq()
);
// Setting the form elements
$form->addElement('header', '', get_lang('TermAddNew'));
$form->addElement(
'text',
'glossary_title',
get_lang('TermName'),
array('id' => 'glossary_title')
);
$form->addElement(
'html_editor',
'glossary_comment',
get_lang('TermDefinition'),
null,
array('ToolbarSet' => 'Glossary', 'Height' => '300')
);
$form->addButtonCreate(get_lang('TermAddButton'), 'SubmitGlossary');
// setting the rules
$form->addRule('glossary_title', get_lang('ThisFieldIsRequired'), 'required');
// The validation or display
if ($form->validate()) {
$check = Security::check_token('post');
if ($check) {
$values = $form->exportValues();
GlossaryManager::save_glossary($values);
}
Security::clear_token();
header('Location: '.$currentUrl);
exit;
} else {
$token = Security::get_token();
$form->addElement('hidden', 'sec_token');
$form->setConstants(array('sec_token' => $token));
$content = $form->returnForm();
}
break; break;
case 'edit_glossary': case 'edit_glossary':
if (!api_is_allowed_to_edit(null, true)) {
api_not_allowed(true);
}
$tool_name = get_lang('Edit'); $tool_name = get_lang('Edit');
break; if (is_numeric($_GET['glossary_id'])) {
case 'import': // initiate the object
$tool_name = get_lang('ImportGlossary');
break;
case 'changeview':
default:
$tool_name = get_lang('List');
break;
}
if (isset($_GET['action']) && $_GET['action'] == 'export') {
$data = GlossaryManager::get_glossary_data(
0,
GlossaryManager::get_number_glossary_terms(api_get_session_id()),
0,
'ASC'
);
usort($data, "sorter");
$list = array();
$list[] = array('term','definition');
foreach($data as $line) {
$list[] = array ($line[0], $line[1]);
}
$filename = 'glossary_course_'.api_get_course_id();
Export::arrayToCsv($list, $filename);
}
if (isset($_GET['action']) && $_GET['action'] == 'export_to_pdf') {
GlossaryManager::export_to_pdf();
}
Display::display_header($tool_name);
// Tool introduction
Display::display_introduction_section(TOOL_GLOSSARY);
if (isset($_GET['action']) && $_GET['action'] == 'changeview' && in_array($_GET['view'], array('list','table'))) {
$_SESSION['glossary_view'] = $_GET['view'];
} else {
if (!isset($_SESSION['glossary_view'])) {
$_SESSION['glossary_view'] = 'table';//Default option
}
}
if (api_is_allowed_to_edit(null, true)) {
switch ($action) {
case 'addglossary':
$form = new FormValidator( $form = new FormValidator(
'glossary', 'glossary',
'post', 'post',
api_get_self().'?action='.Security::remove_XSS($_GET['action']).'&'.api_get_cidreq() api_get_self().'?action='.Security::remove_XSS($_GET['action']).'&glossary_id='.intval($_GET['glossary_id']).'&'.api_get_cidreq()
); );
// Setting the form elements // Setting the form elements
$form->addElement('header', '', get_lang('TermAddNew')); $form->addElement('header', '', get_lang('TermEdit'));
$form->addElement('text', 'glossary_title', get_lang('TermName'), array('size'=>'80', 'id'=>'glossary_title')); $form->addElement('hidden', 'glossary_id');
//$form->applyFilter('glossary_title', 'html_filter'); $form->addElement('text', 'glossary_title', get_lang('TermName'));
$form->addElement('html_editor', 'glossary_comment', get_lang('TermDefinition'), null, array('ToolbarSet' => 'Glossary', 'Height' => '300'));
$form->addButtonCreate(get_lang('TermAddButton'), 'SubmitGlossary'); $form->addElement(
'html_editor',
'glossary_comment',
get_lang('TermDefinition'),
null,
array('ToolbarSet' => 'Glossary', 'Height' => '300')
);
$element = $form->addElement('text', 'insert_date', get_lang('CreationDate'));
$element->freeze();
$element = $form->addElement('text', 'update_date', get_lang('UpdateDate'));
$element->freeze();
$form->addButtonUpdate(get_lang('TermUpdateButton'), 'SubmitGlossary');
// setting the defaults
$glossary_data = GlossaryManager::get_glossary_information($_GET['glossary_id']);
// Date treatment for timezones
if (!empty($glossary_data['insert_date'])) {
$glossary_data['insert_date'] = api_get_local_time($glossary_data['insert_date']);
} else {
$glossary_data['insert_date'] = '';
}
if (!empty($glossary_data['update_date'])) {
$glossary_data['update_date'] = api_get_local_time($glossary_data['update_date']);
} else {
$glossary_data['update_date'] = '';
}
$form->setDefaults($glossary_data);
// setting the rules // setting the rules
$form->addRule('glossary_title', get_lang('ThisFieldIsRequired'), 'required'); $form->addRule('glossary_title', get_lang('ThisFieldIsRequired'), 'required');
// The validation or display // The validation or display
if ($form->validate()) { if ($form->validate()) {
$check = Security::check_token('post'); $check = Security::check_token('post');
if ($check) { if ($check) {
$values = $form->exportValues(); $values = $form->exportValues();
GlossaryManager::save_glossary($values); GlossaryManager::update_glossary($values);
} }
Security::clear_token(); Security::clear_token();
GlossaryManager::display_glossary(); header('Location: '.$currentUrl);
exit;
} else { } else {
$token = Security::get_token(); $token = Security::get_token();
$form->addElement('hidden', 'sec_token'); $form->addElement('hidden', 'sec_token');
$form->setConstants(array('sec_token' => $token)); $form->setConstants(array('sec_token' => $token));
$form->display(); $content = $form->returnForm();
} }
break; }
case 'edit_glossary': break;
if (is_numeric($_GET['glossary_id'])) { case 'delete_glossary':
// initiate the object if (!api_is_allowed_to_edit(null, true)) {
$form = new FormValidator( api_not_allowed(true);
'glossary', }
'post', GlossaryManager::delete_glossary($_GET['glossary_id']);
api_get_self().'?action='.Security::remove_XSS($_GET['action']).'&glossary_id='.intval($_GET['glossary_id']).'&'.api_get_cidreq() Security::clear_token();
); header('Location: '.$currentUrl);
// Setting the form elements exit;
$form->addElement('header', '', get_lang('TermEdit')); break;
$form->addElement('hidden', 'glossary_id'); case 'moveup':
$form->addElement('text', 'glossary_title', get_lang('TermName'),array('size'=>'80')); //GlossaryManager::move_glossary('up',$_GET['glossary_id']); //actions not available
//$form->applyFilter('glossary_title', 'html_filter'); GlossaryManager::display_glossary();
$form->addElement('html_editor', 'glossary_comment', get_lang('TermDefinition'), null, array('ToolbarSet' => 'Glossary', 'Height' => '300')); break;
$element = $form->addElement('text', 'insert_date', get_lang('CreationDate'),array('size'=>'100')); case 'movedown':
$element->freeze(); //GlossaryManager::move_glossary('down',$_GET['glossary_id']); //actions not available
$element = $form->addElement('text', 'update_date', get_lang('UpdateDate'),array('size'=>'100')); GlossaryManager::display_glossary();
$element->freeze(); break;
$form->addButtonUpdate(get_lang('TermUpdateButton'), 'SubmitGlossary'); case 'import':
if (!api_is_allowed_to_edit(null, true)) {
// setting the defaults api_not_allowed(true);
$glossary_data = GlossaryManager::get_glossary_information($_GET['glossary_id']); }
$tool_name = get_lang('ImportGlossary');
// Date treatment for timezones $form = new FormValidator(
if (!empty($glossary_data['insert_date'])) { 'glossary',
$glossary_data['insert_date'] = api_get_local_time($glossary_data['insert_date']); 'post',
} else { api_get_self().'?action=import&'.api_get_cidreq()
$glossary_data['insert_date'] = ''; );
} $form->addElement('header', '', get_lang('ImportGlossary'));
$form->addElement('file', 'file', get_lang('ImportCSVFileLocation'));
if (!empty($glossary_data['update_date'])) { $form->addElement('checkbox', 'replace', null, get_lang('DeleteAllGlossaryTerms'));
$glossary_data['update_date'] = api_get_local_time($glossary_data['update_date']); $form->addButtonImport(get_lang('Import'), 'SubmitImport');
} else { $content = $form->returnForm();
$glossary_data['update_date'] = '';
} $content .= get_lang('CSVMustLookLike').' ('.get_lang('MandatoryFields').')';
$content .= '<pre>
$form->setDefaults($glossary_data); <strong>term</strong>;<strong>definition</strong>;
"Hello";"Hola";
// setting the rules "Good";"Bueno";</pre>';
$form->addRule('glossary_title', get_lang('ThisFieldIsRequired'), 'required');
if ($form->validate()) {
// The validation or display //this is a bad idea //jm
if ($form->validate()) { if (isset($_POST['replace']) && $_POST['replace']) {
$check = Security::check_token('post'); foreach (GlossaryManager::get_glossary_terms() as $term) {
if ($check) { if (!GlossaryManager::delete_glossary($term['id'])) {
$values = $form->exportValues(); Display::addFlash(
GlossaryManager::update_glossary($values); Display::return_message(get_lang("CannotDeleteGlossary") . ':' . $term['id'], 'error')
);
} }
Security::clear_token();
GlossaryManager::display_glossary();
} else {
$token = Security::get_token();
$form->addElement('hidden', 'sec_token');
$form->setConstants(array('sec_token' => $token));
$form->display();
} }
} }
break; $data = Import::csv_reader($_FILES['file']['tmp_name']);
case 'delete_glossary': $good = 0;
GlossaryManager::delete_glossary($_GET['glossary_id']); $bad = 0;
GlossaryManager::display_glossary(); if ($data) {
break;
case 'moveup':
//GlossaryManager::move_glossary('up',$_GET['glossary_id']); //actions not available
GlossaryManager::display_glossary();
break;
case 'movedown':
//GlossaryManager::move_glossary('down',$_GET['glossary_id']); //actions not available
GlossaryManager::display_glossary();
break;
case 'import':
$form = new FormValidator(
'glossary',
'post',
api_get_self().'?action=import&'.api_get_cidreq()
);
$form->addElement('header', '', get_lang('ImportGlossary'));
$form->addElement('file', 'file', get_lang('ImportCSVFileLocation'));
$form->addElement('checkbox', 'replace', null, get_lang('DeleteAllGlossaryTerms'));
$form->addButtonImport(get_lang('Import'), 'SubmitImport');
$form->display();
echo get_lang('CSVMustLookLike').' ('.get_lang('MandatoryFields').')';
echo '<pre>
<strong>term</strong>;<strong>definition</strong>;
"Hello";"Hola";
"Good";"Bueno";</pre>';
if ($form->validate()) {
//this is a bad idea //jm
if (isset($_POST['replace']) && $_POST['replace']) {
foreach (GlossaryManager::get_glossary_terms() as $term) {
if (!GlossaryManager::delete_glossary($term['id'], false)) {
Display::display_error_message(get_lang ("CannotDeleteGlossary") . ':' . $term['id']);
}
}
}
//$data = Import::csvToArray($_FILES['file']['tmp_name']);
$data = Import::csv_reader($_FILES['file']['tmp_name']);
$good = 0;
$bad = 0;
foreach ($data as $item) { foreach ($data as $item) {
$result = GlossaryManager::save_glossary( $result = GlossaryManager::save_glossary(
array( array(
'glossary_title' => $item['term'], 'glossary_title' => $item['term'],
'glossary_comment' => $item['definition'], 'glossary_comment' => $item['definition']
), )
false
); );
if ($result) if ($result) {
$good++; $good++;
else } else {
$bad++; $bad++;
}
} }
}
Display::return_message(get_lang("TermsImported") . ':' . $good);
if ($bad) {
Display::return_message(get_lang("TermsNotImported") . ':' . $bad, 'error');
}
header('Location: '.$currentUrl);
exit;
}
break;
case 'export':
if (!api_is_allowed_to_edit(null, true)) {
api_not_allowed(true);
}
$data = GlossaryManager::get_glossary_data(
0,
GlossaryManager::get_number_glossary_terms(api_get_session_id()),
0,
'ASC'
);
usort($data, "sorter");
$list = array();
$list[] = array('term','definition');
foreach ($data as $line) {
$list[] = array ($line[0], $line[1]);
}
$filename = 'glossary_course_'.api_get_course_id();
Export::arrayToCsv($list, $filename);
break;
case 'export_to_pdf':
GlossaryManager::export_to_pdf();
break;
case 'changeview':
default:
$tool_name = get_lang('List');
$content = GlossaryManager::display_glossary();
break;
}
Display::display_confirmation_message(get_lang ("TermsImported") . ':' . $good); Display::display_header($tool_name);
if ($bad) { // Tool introduction
Display::display_error_message (get_lang ("TermsNotImported") . ':' . $bad); Display::display_introduction_section(TOOL_GLOSSARY);
}
GlossaryManager::display_glossary(); if ($action == 'changeview' && in_array($_GET['view'], array('list','table'))) {
} Session::write('glossary_view', $_GET['view']);
break;
default:
GlossaryManager::display_glossary();
break;
}
} else { } else {
GlossaryManager::display_glossary(); if (!isset($_SESSION['glossary_view'])) {
Session::write('glossary_view', 'table');
}
} }
// Footer echo $content;
Display::display_footer(); Display::display_footer();

166
main/inc/lib/glossary.lib.php
Unescape View File

@ -1,6 +1,8 @@
<?php <?php
/* For licensing terms, see /license.txt */ /* For licensing terms, see /license.txt */
use ChamiloSession as Session;
/** /**
* Class GlossaryManager * Class GlossaryManager
* This library provides functions for the glossary tool. * This library provides functions for the glossary tool.
@ -59,10 +61,11 @@ class GlossaryManager
/** /**
* Get glossary term by glossary id * Get glossary term by glossary id
* @author Isaac Flores <florespaz_isaac@hotmail.com> * @author Isaac Flores <florespaz_isaac@hotmail.com>
* @param string The glossary term name * @param string $glossary_name The glossary term name
*
* @return string The glossary description * @return string The glossary description
*/ */
public static function get_glossary_term_by_glossary_name ($glossary_name) public static function get_glossary_term_by_glossary_name($glossary_name)
{ {
$glossary_table = Database::get_course_table(TABLE_GLOSSARY); $glossary_table = Database::get_course_table(TABLE_GLOSSARY);
$session_id = api_get_session_id(); $session_id = api_get_session_id();
@ -92,9 +95,9 @@ class GlossaryManager
* @author Patrick Cool <patrick.cool@ugent.be>, Ghent University, Belgium * @author Patrick Cool <patrick.cool@ugent.be>, Ghent University, Belgium
* @version januari 2009, dokeos 1.8.6 * @version januari 2009, dokeos 1.8.6
*/ */
public static function save_glossary($values, $message = true) public static function save_glossary($values)
{ {
if (!is_array($values) or !isset($values['glossary_title'])) { if (!is_array($values) || !isset($values['glossary_title'])) {
return false; return false;
} }
// Database table definition // Database table definition
@ -109,8 +112,9 @@ class GlossaryManager
// check if the glossary term already exists // check if the glossary term already exists
if (GlossaryManager::glossary_exists($values['glossary_title'])) { if (GlossaryManager::glossary_exists($values['glossary_title'])) {
// display the feedback message // display the feedback message
if ($message) Display::addFlash(
Display::display_error_message(get_lang('GlossaryTermAlreadyExistsYouShouldEditIt')); Display::return_message(get_lang('GlossaryTermAlreadyExistsYouShouldEditIt'), 'error')
);
return false; return false;
} else { } else {
@ -123,8 +127,8 @@ class GlossaryManager
'session_id' => $session_id, 'session_id' => $session_id,
]; ];
$id = Database::insert($t_glossary, $params); $id = Database::insert($t_glossary, $params);
if ($id) {
if ($id) {
$sql = "UPDATE $t_glossary SET glossary_id = $id WHERE iid = $id"; $sql = "UPDATE $t_glossary SET glossary_id = $id WHERE iid = $id";
Database::query($sql); Database::query($sql);
@ -139,10 +143,11 @@ class GlossaryManager
} }
$_SESSION['max_glossary_display'] = GlossaryManager::get_max_glossary_item(); $_SESSION['max_glossary_display'] = GlossaryManager::get_max_glossary_item();
// display the feedback message // display the feedback message
if ($message) { Display::addFlash(
Display::display_confirmation_message(get_lang('TermAdded')); Display::return_message(get_lang('TermAdded'))
} );
return $id; return $id;
} }
@ -157,7 +162,7 @@ class GlossaryManager
* @author Patrick Cool <patrick.cool@ugent.be>, Ghent University, Belgium * @author Patrick Cool <patrick.cool@ugent.be>, Ghent University, Belgium
* @version januari 2009, dokeos 1.8.6 * @version januari 2009, dokeos 1.8.6
*/ */
public static function update_glossary($values, $message = true) public static function update_glossary($values)
{ {
// Database table definition // Database table definition
$t_glossary = Database :: get_course_table(TABLE_GLOSSARY); $t_glossary = Database :: get_course_table(TABLE_GLOSSARY);
@ -166,8 +171,11 @@ class GlossaryManager
// check if the glossary term already exists // check if the glossary term already exists
if (GlossaryManager::glossary_exists($values['glossary_title'],$values['glossary_id'])) { if (GlossaryManager::glossary_exists($values['glossary_title'],$values['glossary_id'])) {
// display the feedback message // display the feedback message
if ($message)
Display::display_error_message(get_lang('GlossaryTermAlreadyExistsYouShouldEditIt')); Display::addFlash(
Display::return_message(get_lang('GlossaryTermAlreadyExistsYouShouldEditIt'), 'error')
);
return false; return false;
} else { } else {
$sql = "UPDATE $t_glossary SET $sql = "UPDATE $t_glossary SET
@ -188,9 +196,12 @@ class GlossaryManager
'GlossaryUpdated', 'GlossaryUpdated',
api_get_user_id() api_get_user_id()
); );
// display the feedback message // display the feedback message
if ($message) Display::addFlash(
Display::display_confirmation_message(get_lang('TermUpdated')); Display::return_message(get_lang('TermUpdated'))
);
} }
return true; return true;
@ -280,12 +291,12 @@ class GlossaryManager
g.session_id g.session_id
FROM $t_glossary g, $t_item_propery ip FROM $t_glossary g, $t_item_propery ip
WHERE WHERE
g.glossary_id = ip.ref AND g.glossary_id = ip.ref AND
tool = '".TOOL_GLOSSARY."' AND tool = '".TOOL_GLOSSARY."' AND
g.glossary_id = '".intval($glossary_id)."' AND g.glossary_id = '".intval($glossary_id)."' AND
g.c_id = ".api_get_course_int_id()." AND g.c_id = ".api_get_course_int_id()." AND
ip.c_id = ".api_get_course_int_id()." ip.c_id = ".api_get_course_int_id();
";
$result = Database::query($sql); $result = Database::query($sql);
if ($result === false || Database::num_rows($result) != 1) { if ($result === false || Database::num_rows($result) != 1) {
return false; return false;
@ -301,18 +312,26 @@ class GlossaryManager
* @author Patrick Cool <patrick.cool@ugent.be>, Ghent University, Belgium * @author Patrick Cool <patrick.cool@ugent.be>, Ghent University, Belgium
* @version januari 2009, dokeos 1.8.6 * @version januari 2009, dokeos 1.8.6
*/ */
public static function delete_glossary($glossary_id, $message = true) public static function delete_glossary($glossary_id)
{ {
// Database table definition // Database table definition
$t_glossary = Database :: get_course_table(TABLE_GLOSSARY); $t_glossary = Database :: get_course_table(TABLE_GLOSSARY);
$course_id = api_get_course_int_id(); $course_id = api_get_course_int_id();
if (empty($glossary_id)) { return false; } if (empty($glossary_id)) {
return false;
}
$sql = "DELETE FROM $t_glossary WHERE c_id = $course_id AND glossary_id='".intval($glossary_id)."'"; $sql = "DELETE FROM $t_glossary
WHERE
c_id = $course_id AND
glossary_id='".intval($glossary_id)."'";
$result = Database::query($sql); $result = Database::query($sql);
if ($result === false or Database::affected_rows($result) < 1) { return false; } if ($result === false || Database::affected_rows($result) < 1) {
//update item_property (delete) return false;
}
// update item_property (delete)
api_item_property_update( api_item_property_update(
api_get_course_info(), api_get_course_info(),
TOOL_GLOSSARY, TOOL_GLOSSARY,
@ -324,8 +343,11 @@ class GlossaryManager
// reorder the remaining terms // reorder the remaining terms
GlossaryManager::reorder_glossary(); GlossaryManager::reorder_glossary();
$_SESSION['max_glossary_display'] = GlossaryManager::get_max_glossary_item(); $_SESSION['max_glossary_display'] = GlossaryManager::get_max_glossary_item();
if ($message)
Display::display_confirmation_message(get_lang('TermDeleted')); Display::addFlash(
Display::return_message(get_lang('TermDeleted'))
);
return true; return true;
} }
@ -334,7 +356,7 @@ class GlossaryManager
* the glossary terms * the glossary terms
* @param string View ('table' or 'list'). Optional parameter. * @param string View ('table' or 'list'). Optional parameter.
* Defaults to 'table' and prefers glossary_view from the session by default. * Defaults to 'table' and prefers glossary_view from the session by default.
* @return void * @return string
* @author Patrick Cool <patrick.cool@ugent.be>, Ghent University, Belgium * @author Patrick Cool <patrick.cool@ugent.be>, Ghent University, Belgium
* @version januari 2009, dokeos 1.8.6 * @version januari 2009, dokeos 1.8.6
*/ */
@ -342,8 +364,9 @@ class GlossaryManager
{ {
// This function should always be called with the corresponding // This function should always be called with the corresponding
// parameter for view type. Meanwhile, use this cheap trick. // parameter for view type. Meanwhile, use this cheap trick.
if (empty($_SESSION['glossary_view'])) { $view = Session::read('glossary_view');
$_SESSION['glossary_view'] = $view; if (empty($view)) {
Session::write('glossary_view', $view);
} }
// action links // action links
//echo '<div class="actions">'; //echo '<div class="actions">';
@ -363,7 +386,7 @@ class GlossaryManager
$actionsLeft .= '<a href="index.php?'.api_get_cidreq().'&action=export_to_pdf">'. $actionsLeft .= '<a href="index.php?'.api_get_cidreq().'&action=export_to_pdf">'.
Display::return_icon('pdf.png',get_lang('ExportToPDF'),'', ICON_SIZE_MEDIUM).'</a>'; Display::return_icon('pdf.png',get_lang('ExportToPDF'),'', ICON_SIZE_MEDIUM).'</a>';
if ((isset($_SESSION['glossary_view']) && $_SESSION['glossary_view'] == 'table') or (!isset($_SESSION['glossary_view']))){ if (($view == 'table') || (!isset($view))) {
$actionsLeft .= '<a href="index.php?'.api_get_cidreq().'&action=changeview&view=list">'. $actionsLeft .= '<a href="index.php?'.api_get_cidreq().'&action=changeview&view=list">'.
Display::return_icon('view_detailed.png',get_lang('ListView'),'',ICON_SIZE_MEDIUM).'</a>'; Display::return_icon('view_detailed.png',get_lang('ListView'),'',ICON_SIZE_MEDIUM).'</a>';
} else { } else {
@ -391,9 +414,9 @@ class GlossaryManager
array(0 => $actionsLeft, 1 => $actionsRight) array(0 => $actionsLeft, 1 => $actionsRight)
); );
echo $toolbar; $content = $toolbar;
if (!$_SESSION['glossary_view'] || $_SESSION['glossary_view'] == 'table') { if (!$view || $view == 'table') {
$table = new SortableTable( $table = new SortableTable(
'glossary', 'glossary',
array('GlossaryManager', 'get_number_glossary_terms'), array('GlossaryManager', 'get_number_glossary_terms'),
@ -403,15 +426,18 @@ class GlossaryManager
//$table->set_header(0, '', false); //$table->set_header(0, '', false);
$table->set_header(0, get_lang('TermName'), true); $table->set_header(0, get_lang('TermName'), true);
$table->set_header(1, get_lang('TermDefinition'), true); $table->set_header(1, get_lang('TermDefinition'), true);
if (api_is_allowed_to_edit(null,true)) { if (api_is_allowed_to_edit(null, true)) {
$table->set_header(2, get_lang('Actions'), false, 'width=90px', array('class' => 'td_actions')); $table->set_header(2, get_lang('Actions'), false, 'width=90px', array('class' => 'td_actions'));
$table->set_column_filter(2, array('GlossaryManager','actions_filter')); $table->set_column_filter(2, array('GlossaryManager','actions_filter'));
} }
$table->display(); $content .= $table->return_table();
} }
if ($_SESSION['glossary_view'] == 'list') {
GlossaryManager::display_glossary_list(); if ($view == 'list') {
$content .= GlossaryManager::display_glossary_list();
} }
return $content;
} }
/** /**
@ -423,14 +449,15 @@ class GlossaryManager
public static function display_glossary_list() public static function display_glossary_list()
{ {
$glossary_data = self::get_glossary_data(0,1000,0,'ASC'); $glossary_data = self::get_glossary_data(0,1000,0,'ASC');
$content = '';
foreach ($glossary_data as $key => $glossary_item) { foreach ($glossary_data as $key => $glossary_item) {
$actions = ''; $actions = '';
if (api_is_allowed_to_edit(null,true)) { if (api_is_allowed_to_edit(null,true)) {
$actions = '<div class="pull-right">'.self::actions_filter($glossary_item[2], '',$glossary_item).'</div>'; $actions = '<div class="pull-right">'.self::actions_filter($glossary_item[2], '',$glossary_item).'</div>';
} }
echo Display::panel($glossary_item[1], $glossary_item[0].' '.$actions); $content .= Display::panel($glossary_item[1], $glossary_item[0].' '.$actions);
} }
return true; return $content;
} }
/** /**
@ -484,6 +511,8 @@ class GlossaryManager
public static function get_glossary_data($from, $number_of_items, $column, $direction) public static function get_glossary_data($from, $number_of_items, $column, $direction)
{ {
$_user = api_get_user_info(); $_user = api_get_user_info();
$view = Session::read('glossary_view');
// Database table definition // Database table definition
$t_glossary = Database :: get_course_table(TABLE_GLOSSARY); $t_glossary = Database :: get_course_table(TABLE_GLOSSARY);
$t_item_propery = Database :: get_course_table(TABLE_ITEM_PROPERTY); $t_item_propery = Database :: get_course_table(TABLE_ITEM_PROPERTY);
@ -538,7 +567,7 @@ class GlossaryManager
$session_img = api_get_session_image($data['session_id'], $_user['status']); $session_img = api_get_session_image($data['session_id'], $_user['status']);
$array[0] = $data[0] . $session_img; $array[0] = $data[0] . $session_img;
if (!$_SESSION['glossary_view'] || $_SESSION['glossary_view'] == 'table') { if (!$view || $view == 'table') {
$array[1] = str_replace(array('<p>', '</p>'), array('', '<br />'), $data[1]); $array[1] = str_replace(array('<p>', '</p>'), array('', '<br />'), $data[1]);
} else { } else {
$array[1] = $data[1]; $array[1] = $data[1];
@ -567,16 +596,18 @@ class GlossaryManager
public static function actions_filter($glossary_id, $url_params, $row) public static function actions_filter($glossary_id, $url_params, $row)
{ {
$glossary_id = $row[2]; $glossary_id = $row[2];
$return = '<a href="'.api_get_self().'?action=edit_glossary&amp;glossary_id='.$glossary_id.'&'.api_get_cidreq().'&msg=edit">'.Display::return_icon('edit.png',get_lang('Edit'),'',22).'</a>'; $return = '<a href="'.api_get_self().'?action=edit_glossary&amp;glossary_id='.$glossary_id.'&'.api_get_cidreq().'&msg=edit">'.
Display::return_icon('edit.png',get_lang('Edit'),'',22).'</a>';
$glossary_data = GlossaryManager::get_glossary_information($glossary_id); $glossary_data = GlossaryManager::get_glossary_information($glossary_id);
$glossary_term = $glossary_data['glossary_title']; $glossary_term = $glossary_data['glossary_title'];
if (api_is_allowed_to_edit(null, true)) { if (api_is_allowed_to_edit(null, true)) {
if ($glossary_data['session_id'] == api_get_session_id()) { if ($glossary_data['session_id'] == api_get_session_id()) {
$return .= '<a href="'.api_get_self().'?action=delete_glossary&amp;glossary_id='.$glossary_id.'&'.api_get_cidreq().'" onclick="return confirmation(\''.$glossary_term.'\');">'.Display::return_icon('delete.png', get_lang('Delete'),'',22).'</a>'; $return .= '<a href="'.api_get_self().'?action=delete_glossary&amp;glossary_id='.$glossary_id.'&'.api_get_cidreq().'" onclick="return confirmation(\''.$glossary_term.'\');">'.
Display::return_icon('delete.png', get_lang('Delete'),'',22).'</a>';
} else { } else {
$return = get_lang('EditionNotAvailableFromSession'); $return = get_lang('EditionNotAvailableFromSession');
} }
} }
@ -593,14 +624,14 @@ class GlossaryManager
*/ */
public static function javascript_glossary() public static function javascript_glossary()
{ {
return "<script type=\"text/javascript\"> return "<script>
function confirmation (name) { function confirmation (name) {
if (confirm(\" ". get_lang("TermConfirmDelete") ." \"+ name + \" ?\")) if (confirm(\" ".get_lang("TermConfirmDelete")." \"+ name + \" ?\"))
{return true;} {return true;}
else else
{return false;} {return false;}
} }
</script>"; </script>";
} }
/** /**
@ -609,7 +640,8 @@ class GlossaryManager
* @author Patrick Cool <patrick.cool@ugent.be>, Ghent University, Belgium * @author Patrick Cool <patrick.cool@ugent.be>, Ghent University, Belgium
* @version januari 2009, dokeos 1.8.6 * @version januari 2009, dokeos 1.8.6
*/ */
public static function reorder_glossary() { public static function reorder_glossary()
{
// Database table definition // Database table definition
$t_glossary = Database :: get_course_table(TABLE_GLOSSARY); $t_glossary = Database :: get_course_table(TABLE_GLOSSARY);
$course_id = api_get_course_int_id(); $course_id = api_get_course_int_id();
@ -630,13 +662,13 @@ class GlossaryManager
/** /**
* Move a glossary term * Move a glossary term
* *
* @param unknown_type $direction * @param string $direction
* @param unknown_type $glossary_id * @param string $glossary_id
* *
* @author Patrick Cool <patrick.cool@ugent.be>, Ghent University, Belgium * @author Patrick Cool <patrick.cool@ugent.be>, Ghent University, Belgium
* @version januari 2009, dokeos 1.8.6 * @version januari 2009, dokeos 1.8.6
*/ */
public static function move_glossary($direction, $glossary_id, $message = true) public static function move_glossary($direction, $glossary_id)
{ {
// Database table definition // Database table definition
$t_glossary = Database :: get_course_table(TABLE_GLOSSARY); $t_glossary = Database :: get_course_table(TABLE_GLOSSARY);
@ -655,7 +687,7 @@ class GlossaryManager
$res = Database::query($sql); $res = Database::query($sql);
$found = false; $found = false;
while ($row = Database::fetch_array($res)) { while ($row = Database::fetch_array($res)) {
if ($found && empty($next_id)) { if ($found && empty($next_id)) {
$next_id = $row['glossary_id']; $next_id = $row['glossary_id'];
$next_display_order = $row['display_order']; $next_display_order = $row['display_order'];
} }
@ -672,16 +704,21 @@ class GlossaryManager
WHERE c_id = $course_id AND glossary_id = '".Database::escape_string($next_id)."'"; WHERE c_id = $course_id AND glossary_id = '".Database::escape_string($next_id)."'";
Database::query($sql1); Database::query($sql1);
Database::query($sql2); Database::query($sql2);
if ($message)
Display::display_confirmation_message(get_lang('TermMoved')); Display::addFlash(Display::return_message(get_lang('TermMoved')));
} }
/** /**
* * Export to pdf
*/ */
public static function export_to_pdf() public static function export_to_pdf()
{ {
$data = GlossaryManager::get_glossary_data(0, GlossaryManager::get_number_glossary_terms(api_get_session_id()), 0, 'ASC'); $data = GlossaryManager::get_glossary_data(
0,
GlossaryManager::get_number_glossary_terms(api_get_session_id()),
0,
'ASC'
);
$html = '<html><body>'; $html = '<html><body>';
$html .= '<h2>'.get_lang('Glossary').'</h2><hr><br><br>'; $html .= '<h2>'.get_lang('Glossary').'</h2><hr><br><br>';
foreach ($data as $item) { foreach ($data as $item) {
@ -692,13 +729,6 @@ class GlossaryManager
$html .= '</body></html>'; $html .= '</body></html>';
$course_code = api_get_course_id(); $course_code = api_get_course_id();
$pdf = new PDF(); $pdf = new PDF();
//$pdf->set_custom_header($title);
/*$css_file = api_get_path(SYS_CODE_PATH).'css/print.css';
if (file_exists($css_file)) {
$css = @file_get_contents($css_file);
} else {
$css = '';
}*/
$pdf->content_to_pdf($html, '', get_lang('Glossary').'_'.$course_code, $course_code); $pdf->content_to_pdf($html, '', get_lang('Glossary').'_'.$course_code, $course_code);
} }
} }

Write Preview
Loading…
Cancel
Save