mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity

grade/import/csv: MDL-20876 Fix split() call and remove redundant escaping.

Browse Source
This commit is contained in:
Jonathan Harker 2010-07-20 03:23:20 +00:00
parent 390cc887da
commit d5b36b401c
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
grade/import/csv/index.php
View File

@ -50,19 +50,16 @@ $currentgroup = groups_get_course_group($course);
// sort out delimiter // sort out delimiter
if (isset($CFG->CSV_DELIMITER)) { if (isset($CFG->CSV_DELIMITER)) {
$csv_delimiter = '\\' . $CFG->CSV_DELIMITER; $csv_delimiter = $CFG->CSV_DELIMITER;
$csv_delimiter2 = $CFG->CSV_DELIMITER;
if (isset($CFG->CSV_ENCODE)) { if (isset($CFG->CSV_ENCODE)) {
$csv_encode = '/\&\#' . $CFG->CSV_ENCODE . '/'; $csv_encode = '/\&\#' . $CFG->CSV_ENCODE . '/';
} }
} else if ($separator == 'tab') { } else if ($separator == 'tab') {
$csv_delimiter = "\t"; $csv_delimiter = "\t";
$csv_delimiter2 = "";
$csv_encode = ""; $csv_encode = "";
} else { } else {
$csv_delimiter = "\,"; $csv_delimiter = ",";
$csv_delimiter2 = ",";
$csv_encode = '/\&\#44/'; $csv_encode = '/\&\#44/';
} }
@ -91,7 +88,7 @@ if ($id) {
if ($importcode = optional_param('importcode', '', PARAM_FILE)) { if ($importcode = optional_param('importcode', '', PARAM_FILE)) {
$filename = $CFG->dataroot.'/temp/gradeimport/cvs/'.$USER->id.'/'.$importcode; $filename = $CFG->dataroot.'/temp/gradeimport/cvs/'.$USER->id.'/'.$importcode;
$fp = fopen($filename, "r"); $fp = fopen($filename, "r");
$header = split($csv_delimiter, fgets($fp,GRADE_CSV_LINE_LENGTH), PARAM_RAW); $header = explode($csv_delimiter, fgets($fp,GRADE_CSV_LINE_LENGTH), PARAM_RAW);
} }
$mform2 = new grade_import_mapping_form(null, array('gradeitems'=>$gradeitems, 'header'=>$header)); $mform2 = new grade_import_mapping_form(null, array('gradeitems'=>$gradeitems, 'header'=>$header));
@ -144,7 +141,7 @@ if ($formdata = $mform->get_data()) {
} }
echo '</tr>'; echo '</tr>';
while (!feof ($fp) && $numlines <= $formdata->previewrows) { while (!feof ($fp) && $numlines <= $formdata->previewrows) {
$lines = split($csv_delimiter, fgets($fp,GRADE_CSV_LINE_LENGTH)); $lines = explode($csv_delimiter, fgets($fp,GRADE_CSV_LINE_LENGTH));
echo '<tr>'; echo '<tr>';
foreach ($lines as $line) { foreach ($lines as $line) {
echo '<td>'.$line.'</td>';; echo '<td>'.$line.'</td>';;
@ -173,7 +170,7 @@ if ($formdata = $mform->get_data()) {
if ($fp = fopen($filename, "r")) { if ($fp = fopen($filename, "r")) {
// --- get header (field names) --- // --- get header (field names) ---
$header = split($csv_delimiter, clean_param(fgets($fp,GRADE_CSV_LINE_LENGTH), PARAM_RAW)); $header = explode($csv_delimiter, clean_param(fgets($fp,GRADE_CSV_LINE_LENGTH), PARAM_RAW));
foreach ($header as $i => $h) { foreach ($header as $i => $h) {
$h = trim($h); $header[$i] = $h; // remove whitespace $h = trim($h); $header[$i] = $h; // remove whitespace
@ -222,14 +219,14 @@ if ($formdata = $mform->get_data()) {
if ($fp = fopen($filename, "r")) { if ($fp = fopen($filename, "r")) {
// read the first line makes sure this doesn't get read again // read the first line makes sure this doesn't get read again
$header = split($csv_delimiter, fgets($fp,GRADE_CSV_LINE_LENGTH)); $header = explode($csv_delimiter, fgets($fp,GRADE_CSV_LINE_LENGTH));
$newgradeitems = array(); // temporary array to keep track of what new headers are processed $newgradeitems = array(); // temporary array to keep track of what new headers are processed
$status = true; $status = true;
while (!feof ($fp)) { while (!feof ($fp)) {
// add something // add something
$line = split($csv_delimiter, fgets($fp,GRADE_CSV_LINE_LENGTH)); $line = explode($csv_delimiter, fgets($fp,GRADE_CSV_LINE_LENGTH));
if(count($line) <= 1){ if(count($line) <= 1){
// there is no data on this line, move on // there is no data on this line, move on
@ -245,8 +242,8 @@ if ($formdata = $mform->get_data()) {
//decode encoded commas //decode encoded commas
$value = clean_param($value, PARAM_RAW); $value = clean_param($value, PARAM_RAW);
$value = trim($value); $value = trim($value);
if ($csv_encode != $csv_delimiter2) { if (!empty($csv_encode)) {
$value = preg_replace($csv_encode, $csv_delimiter2, $value); $value = preg_replace($csv_encode, $csv_delimiter, $value);
} }
/* /*