From: skodak <skodak>
Date: Wed, 26 Sep 2007 19:34:54 +0000 (+0000)
Subject: MDL-10985 improved form validation in xml grade import
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=d7a61f65c19c52b28d7b7e31bef782aa3f68377e;p=moodle.git

MDL-10985 improved form validation in xml grade import
---

diff --git a/grade/import/xml/grade_import_form.php b/grade/import/xml/grade_import_form.php
index 17eabb733d..fbb806a3b2 100644
--- a/grade/import/xml/grade_import_form.php
+++ b/grade/import/xml/grade_import_form.php
@@ -55,12 +55,17 @@ class grade_import_form extends moodleform {
         $this->add_action_buttons(false, get_string('uploadgrades', 'grades'));
     }
 
-    function validation($data) {
+    function validation($data, $files) {
         $err = array();
+        if (empty($data['url']) and empty($files['userfile'])) {
+            if (array_key_exists('url', $data)) {
+                $err['url'] = get_string('required');
+            }
+            if (array_key_exists('userfile', $data)) {
+                $err['userfile'] = get_string('required');
+            }
 
-        $strrequired = get_string('required');
-
-        if (array_key_exists('url', $data) and $data['url'] != clean_param($data['url'], PARAM_URL)) {
+        } else if (array_key_exists('url', $data) and $data['url'] != clean_param($data['url'], PARAM_URL)) {
             $err['url'] = get_string('error');
         }