From 166e5fed25249679ba7d3c4ecd7e1a5b70e3d7ad Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Wed, 23 Apr 2014 15:46:33 -0500
Subject: [PATCH] Simplify header detection logic with outdent
---
include/class.user.php | 61 +++++++++++++++++++++---------------------
1 file changed, 30 insertions(+), 31 deletions(-)
diff --git a/include/class.user.php b/include/class.user.php
index e0042c1a2..083368fc6 100644
--- a/include/class.user.php
+++ b/include/class.user.php
@@ -332,43 +332,42 @@ class User extends UserModel {
if ($f->get('name'))
$named_fields[] = $f;
- if (($data = fgetcsv($stream, 1000, ","))) {
- if (Validator::is_email($data[1])) {
- $has_header = false; // We don't have an header!
- }
- else {
- $headers = array();
- foreach ($data as $h) {
- $found = false;
- foreach ($all_fields as $f) {
- if (in_array(mb_strtolower($h), array(
- mb_strtolower($f->get('name')), mb_strtolower($f->get('label'))))) {
- $found = true;
- if (!$f->get('name'))
- return $h.': Field must have `variable` set to be imported';
+ if (!($data = fgetcsv($stream, 1000, ",")))
+ return 'Whoops. Perhaps you meant to send some CSV records';
+
+ if (Validator::is_email($data[1])) {
+ $has_header = false; // We don't have an header!
+ }
+ else {
+ $headers = array();
+ foreach ($data as $h) {
+ $found = false;
+ foreach ($all_fields as $f) {
+ if (in_array(mb_strtolower($h), array(
+ mb_strtolower($f->get('name')), mb_strtolower($f->get('label'))))) {
+ $found = true;
+ if (!$f->get('name'))
+ return $h.': Field must have `variable` set to be imported';
+ $headers[$f->get('name')] = $f->get('label');
+ break;
+ }
+ }
+ if (!$found) {
+ $has_header = false;
+ if (count($data) == count($named_fields)) {
+ // Number of fields in the user form matches the number
+ // of fields in the data. Assume things line up
+ $headers = array();
+ foreach ($named_fields as $f)
$headers[$f->get('name')] = $f->get('label');
- break;
- }
+ break;
}
- if (!$found) {
- $has_header = false;
- if (count($data) == count($named_fields)) {
- // Number of fields in the user form matches the number
- // of fields in the data. Assume things line up
- $headers = array();
- foreach ($named_fields as $f)
- $headers[$f->get('name')] = $f->get('label');
- break;
- }
- else {
- return $h.': Unable to map header to a user field';
- }
+ else {
+ return $h.': Unable to map header to a user field';
}
}
}
}
- else
- return 'Whoops. Perhaps you meant to send some CSV records';
// 'name' and 'email' MUST be in the headers
if (!isset($headers['name']) || !isset($headers['email']))
--
GitLab