From 8ace0a686632aa48aea716dbbc45e56e7f8f8590 Mon Sep 17 00:00:00 2001
From: Nicholas Wijaya <13516121@std.stei.itb.ac.id>
Date: Thu, 31 Jan 2019 15:10:23 +0700
Subject: [PATCH] fix minor bug on parsing csv
---
app/Http/Controllers/Auth/RegisterController.php | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index 16ac341..54d3c51 100644
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -87,7 +87,7 @@ class RegisterController extends Controller
if(User::where('username',$username)->count()>0) {
echo '<div class="alert alert-warning alert-dismissible fade show text-center">
<button type="button" class="close" data-dismiss="alert">×</button>
- This user <strong>already exist.</strong>
+ User ' . $username . ' <strong>already exist.</strong>
</div>';
return view('auth.register');
} else if(strlen($data['username']) > 18){
@@ -131,6 +131,7 @@ class RegisterController extends Controller
$data['phone'] = $line[3];
$data['password'] = $line[4];
$data['role'] = $role;
+ $this->registerUser($data);
}
fclose($file);
@@ -147,6 +148,7 @@ class RegisterController extends Controller
<button type="button" class="close" data-dismiss="alert">×</button>
<strong>File Error!</strong> Please try to reupload the file.
</div>';
+ return view('auth.register');
}
else {
$extension = explode(".", $file["name"]);
@@ -156,14 +158,17 @@ class RegisterController extends Controller
<button type="button" class="close" data-dismiss="alert">×</button>
<strong>File Error!</strong> Extension of the file must be csv.
</div>';
+ return view('auth.register');
}
else {
$this->massRegister($file["tmp_name"], $data["role"]);
+ return view('auth.register');
}
}
}
else {
$this->registerUser($data);
+ return view('auth.register');
}
}
}
--
GitLab