Fix export csv see BT#10895

pull/2487/head
jmontoyaa 10 years ago
parent 69919892f4
commit 6dc879ea48
  1. 16
      main/glossary/index.php
  2. 2
      main/inc/lib/export.lib.inc.php

@ -198,10 +198,8 @@ switch ($action) {
);
$form->addElement('header', '', get_lang('ImportGlossary'));
$form->addElement('file', 'file', get_lang('ImportCSVFileLocation'));
$form->addElement('checkbox', 'replace', null, get_lang('DeleteAllGlossaryTerms'));
$form->addElement('checkbox', 'update', null, get_lang('UpdateExistingGlossaryTerms'));
$form->addButtonImport(get_lang('Import'), 'SubmitImport');
$content = $form->returnForm();
@ -316,13 +314,19 @@ switch ($action) {
if (count($badList) > 0) {
Display::addFlash(
Display::return_message(get_lang("GlossaryTermAlreadyExists").': ' . implode(', ', $badList), 'error')
Display::return_message(
get_lang("GlossaryTermAlreadyExists").': ' . implode(', ', $badList),
'error'
)
);
}
if (count($doubles) > 0) {
Display::addFlash(
Display::return_message(get_lang("TermsDuplicatedInFile").': '.implode(', ', $doubles), 'warning')
Display::return_message(
get_lang("TermsDuplicatedInFile").': '.implode(', ', $doubles),
'warning'
)
);
}
@ -343,9 +347,9 @@ switch ($action) {
usort($data, "sorter");
$list = array();
$list[] = array('term','definition');
$list[] = array('term', 'definition');
foreach ($data as $line) {
$list[] = array ($line[0], $line[1]);
$list[] = array($line[0], $line[1]);
}
$filename = 'glossary_course_'.api_get_course_id();
Export::arrayToCsv($list, $filename);

@ -43,7 +43,6 @@ class Export
public static function arrayToCsv($data, $filename = 'export')
{
if (empty($data)) {
return false;
}
@ -53,6 +52,7 @@ class Export
$writer->setStream(fopen($filePath, 'w'));
foreach ($data as $item) {
$item = array_map('trim', $item);
$writer->writeItem($item);
}
$writer->finish();

Loading…
Cancel
Save