From bd19018699d54f51b78acc1fe8564fdeb3906f79 Mon Sep 17 00:00:00 2001
From: shibafu <shibafu528@gmail.com>
Date: Tue, 2 Jan 2018 23:37:27 +0900
Subject: [PATCH] =?UTF-8?q?=E8=A4=87=E6=95=B0=E8=A1=8C=E5=85=A5=E5=8A=9B?=
 =?UTF-8?q?=E5=8F=AF=E8=83=BD=E3=81=AA=E9=A0=85=E7=9B=AE=E3=81=AF=E3=80=81?=
 =?UTF-8?q?=E5=87=A6=E7=90=86=E5=89=8D=E3=81=AB=E6=94=B9=E8=A1=8C=E3=82=B3?=
 =?UTF-8?q?=E3=83=BC=E3=83=89=E3=82=92=E6=AD=A3=E8=A6=8F=E5=8C=96=E3=81=99?=
 =?UTF-8?q?=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix #1
---
 app/Http/Controllers/EjaculationController.php | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/EjaculationController.php b/app/Http/Controllers/EjaculationController.php
index d300f9d..a4adceb 100644
--- a/app/Http/Controllers/EjaculationController.php
+++ b/app/Http/Controllers/EjaculationController.php
@@ -18,14 +18,19 @@ class EjaculationController extends Controller
 
     public function store(Request $request)
     {
-        Validator::make($request->all(), [
+        $inputs = $request->all();
+        if ($request->has('note')) {
+            $inputs['note'] = str_replace(["\r\n", "\r"], "\n", $inputs['note']);
+        }
+
+        Validator::make($inputs, [
             'date' => 'required|date_format:Y/m/d',
             'time' => 'required|date_format:H:i',
             'note' => 'nullable|string|max:500',
-        ])->after(function ($validator) use ($request) {
+        ])->after(function ($validator) use ($request, $inputs) {
             // 日時の重複チェック
             if (!$validator->errors()->hasAny(['date', 'time'])) {
-                $dt = $request->input('date') . ' ' . $request->input('time');
+                $dt = $inputs['date'] . ' ' . $inputs['time'];
                 if (Ejaculation::where(['user_id' => Auth::id(), 'ejaculated_date' => $dt])->count()) {
                     $validator->errors()->add('datetime', '既にこの日時にチェックインしているため、登録できません。');
                 }
@@ -34,8 +39,8 @@ class EjaculationController extends Controller
 
         $ejaculation = Ejaculation::create([
             'user_id' => Auth::id(),
-            'ejaculated_date' => Carbon::createFromFormat('Y/m/d H:i', $request->input('date') . ' ' . $request->input('time')),
-            'note' => $request->input('note') ?? '',
+            'ejaculated_date' => Carbon::createFromFormat('Y/m/d H:i', $inputs['date'] . ' ' . $inputs['time']),
+            'note' => $inputs['note'] ?? '',
             'is_private' => $request->has('is_private') ?? false
         ]);