From 10ec29097f9b963565b206b1179b9f6d899cf749 Mon Sep 17 00:00:00 2001
From: Francois Marier <francois@catalyst.net.nz>
Date: Sun, 15 Mar 2009 23:33:21 +0000
Subject: [PATCH] Fix CVS-git drift

---
 mod/data/import.php | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/mod/data/import.php b/mod/data/import.php
index 17455ac4148f1..3c6553141df10 100755
--- a/mod/data/import.php
+++ b/mod/data/import.php
@@ -102,11 +102,24 @@
         $recordsadded = 0;
 
         if (!$records = data_get_records_csv($filename, $fielddelimiter, $fieldenclosure)) {
-            error('get_records_csv failed to read data from the uploaded file. Please check file for field name typos and formatting errors.');
+            print_error('csvfailed','data',"{$CFG->wwwroot}/mod/data/edit.php?d={$data->id}");
         } else {
             //$db->debug = true;
             $fieldnames = array_shift($records);
 
+            // check the fieldnames are valid
+            $fields = get_records('data_fields', 'dataid', $data->id, '', 'name, id, type');
+            $errorfield = '';
+            foreach ($fieldnames as $name) {
+                if (!isset($fields[$name])) {
+                    $errorfield .= "'$name' ";
+                }
+            }
+
+            if (!empty($errorfield)) {
+                print_error('fieldnotmatched','data',"{$CFG->wwwroot}/mod/data/edit.php?d={$data->id}",$errorfield);
+            }
+
             foreach ($records as $record) {
                 if ($recordid = data_add_record($data, 0)) {  // add instance to data_record
                     $fields = get_records('data_fields', 'dataid', $data->id, '', 'name, id, type');
@@ -197,6 +210,7 @@ function my_file_get_contents($filename, $use_include_path = 0) {
 function data_get_records_csv($filename, $fielddelimiter=',', $fieldenclosure="\n") {
     global $db;
 
+
     if (empty($fielddelimiter)) {
         $fielddelimiter = ',';
     }