L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-34337-master' of git://github.com/ankitagarwal/moodle

Browse Source
This commit is contained in:
Aparup Banerjee
2012-08-13 10:16:03 +08:00
parent e9b5490e29 4d26f274c4
commit 2cfd8f9427
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/scorm/report/basic/report.php
+7 -10
View File
@@ -22,6 +22,7 @@
*/
defined('MOODLE_INTERNAL') || die();
require_once($CFG->libdir . '/csvlib.class.php');
class scorm_basic_report extends scorm_default_report {
/**
@@ -260,13 +261,9 @@ class scorm_basic_report extends scorm_default_report {
}
$rownum=1;
} else if ($download=='CSV') {
$filename .= ".txt";
header("Content-Type: application/download\n");
header("Content-Disposition: attachment; filename=\"$filename\"");
header("Expires: 0");
header("Cache-Control: must-revalidate,post-check=0,pre-check=0");
header("Pragma: public");
echo implode("\t", $headers)." \n";
$csvexport = new csv_export_writer("tab");
$csvexport->set_filename($filename, ".txt");
$csvexport->add_data($headers);
}
$params = array();
list($usql, $params) = $DB->get_in_or_equal($allowedlist, SQL_PARAMS_NAMED);
@@ -474,9 +471,8 @@ class scorm_basic_report extends scorm_default_report {
$colnum++;
}
$rownum++;
} else if ($download=='CSV') {
$text = implode("\t", $row);
echo $text." \n";
} else if ($download == 'CSV') {
$csvexport->add_data($row);
}
}
if (!$download) {
@@ -535,6 +531,7 @@ class scorm_basic_report extends scorm_default_report {
$workbook->close();
exit;
} else if ($download == 'CSV') {
$csvexport->download_file();
exit;
}
} else {