From fd9672ac65068a16c7c0ce25013dadf48405dcec Mon Sep 17 00:00:00 2001
From: Rossiani Wijaya <rwijaya@moodle.com>
Date: Wed, 6 Jul 2011 15:13:16 +0800
Subject: [PATCH] MDL-27931 admin bulk user upload: convert city as required
 field. Credit goes to Charles Fulton for supplying the patch.

---
 admin/uploaduser.php      | 8 ++++++++
 admin/uploaduser_form.php | 5 +----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/admin/uploaduser.php b/admin/uploaduser.php
index c2f4d520f8c..46119300ad4 100644
--- a/admin/uploaduser.php
+++ b/admin/uploaduser.php
@@ -915,6 +915,14 @@ while ($linenum <= $previewrows and $fields = $cir->next()) {
             $rowcols['status'][] = $stremailduplicate;
         }
     }
+
+    if (isset($rowcols['city'])) {
+        $rowcols['city'] = trim($rowcols['city']);
+        if (empty($rowcols['city'])) {
+            $rowcols['status'][] = get_string('fieldrequired', 'error', 'city');
+        }
+    }
+
     $rowcols['status'] = implode('<br />', $rowcols['status']);
     $data[] = $rowcols;
 }
diff --git a/admin/uploaduser_form.php b/admin/uploaduser_form.php
index af0dd74cbf5..d3db70c03b0 100644
--- a/admin/uploaduser_form.php
+++ b/admin/uploaduser_form.php
@@ -264,6 +264,7 @@ class admin_uploaduser_form2 extends moodleform {
         } else {
             $mform->setDefault('city', $CFG->defaultcity);
         }
+        $mform->addRule('city', get_string('required'), 'required');
 
         $mform->addElement('select', 'country', get_string('selectacountry'), get_string_manager()->get_list_of_countries());
         if (empty($CFG->country)) {
@@ -408,10 +409,6 @@ class admin_uploaduser_form2 extends moodleform {
             if (!in_array('email', $columns) and empty($data['email'])) {
                 $errors['email'] = get_string('requiredtemplate', 'admin');
             }
-
-            if (!in_array('city', $columns) and empty($data['city'])) {
-                $errors['city'] = get_string('required');
-            }
         }
 
         return $errors;