From 7bb50a61a758bceed67c5bbbbbad89954c816056 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 24 Jul 2018 20:11:35 -0700
Subject: [PATCH] =?UTF-8?q?Applying=20@dmeltzer=E2=80=99s=20changes=20from?=
 =?UTF-8?q?=20afc8ac5e720187c236509dcc015f842e3029df7a?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Auth/LoginController.php | 6 +++---
 app/Importer/Importer.php                     | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index c3ed77d12d..4bcb8fe011 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -214,7 +214,7 @@ class LoginController extends Controller
         }
 
         $user = Auth::user();
-        $google2fa = app()->make('PragmaRX\Google2FA\Contracts\Google2FA');
+        $google2fa = app()->make('pragmarx.google2fa');
 
         if ($user->two_factor_secret=='') {
             $user->two_factor_secret = $google2fa->generateSecretKey(32);
@@ -222,7 +222,7 @@ class LoginController extends Controller
         }
 
 
-        $google2fa_url = $google2fa->getQRCodeGoogleUrl(
+        $google2fa_url = $google2fa->getQRCodeInline(
             urlencode(Setting::getSettings()->site_name),
             urlencode($user->username),
             $user->two_factor_secret
@@ -257,7 +257,7 @@ class LoginController extends Controller
 
         $user = Auth::user();
         $secret = $request->get('two_factor_secret');
-        $google2fa = app()->make('PragmaRX\Google2FA\Contracts\Google2FA');
+        $google2fa = app()->make('pragmarx.google2fa');
         $valid = $google2fa->verifyKey($user->two_factor_secret, $secret);
 
         if ($valid) {
diff --git a/app/Importer/Importer.php b/app/Importer/Importer.php
index c660038af0..9d5cfae9b9 100644
--- a/app/Importer/Importer.php
+++ b/app/Importer/Importer.php
@@ -115,7 +115,8 @@ abstract class Importer
     public function import()
     {
         $headerRow = $this->csv->fetchOne();
-        $results = $this->normalizeInputArray($this->csv->fetchAssoc());
+        $this->csv->setHeaderOffset(0);
+        $results = $this->normalizeInputArray($this->csv->getRecords());
 
         $this->populateCustomFields($headerRow);