From 0bf71f65373c32ee5a57f55ba937dfecee10ae67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=83=86=E3=82=AF=E3=83=8B=E3=82=AB=E3=83=AB=E8=AB=8F?=
 =?UTF-8?q?=E8=A8=AA=E5=AD=90?= <renraku@076.ne.jp>
Date: Fri, 3 Dec 2021 14:30:34 +0900
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E7=AB=A0=E3=81=AE=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Home/Contact.php | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/Home/Contact.php b/app/Http/Controllers/Home/Contact.php
index 340f0eb..03c7044 100644
--- a/app/Http/Controllers/Home/Contact.php
+++ b/app/Http/Controllers/Home/Contact.php
@@ -87,19 +87,25 @@ class Contact {
     // 文章
     if (!isset($this->field['bunsyo']) || is_null($this->field['bunsyo']) || $this->field['bunsyo'] == '') $err[] = '文章をご入力下さい。';
     if (str_contains($this->field['bunsyo'], 'http://') || str_contains($this->field['bunsyo'], 'https://')) $err[] = '文章でURLを入らないで下さい。';
-    if (isset($this->field['gpg'])) $this->field['bunsyo'] = $gpg->encrypt(trim("メール： ".$this->field['adr']."\n\n".$this->field['bunsyo']));
+    if (isset($this->field['gpg']) && !is_null($this->field['gpg']) && $this->field['gpg'] != '') $this->field['bunsyo'] = $gpg->encrypt(trim("メール： ".$this->field['adr']."\n\n".$this->field['bunsyo']));
 
     // 連絡ルール
     if (!$this->field['ruleapply']) $err[] = 'ルールを同意して下さい。';
 
     if (!empty($err)) {
-      if (isset($this->field['gpg']) && !is_null($this->field['gpg']) && $this->field['gpg'] != '') Storage::disk('public')->delete($this->field['filename']);
+      if (isset($this->field['gpg']) && !is_null($this->field['gpg']) && $this->field['gpg'] != '') {
+        Storage::disk('public')->delete($this->field['filename']);
+        $this->field['bunsyo'] = $r->bunsyo;
+      }
       return view('pages.site.contact', ['field' => $this->field, 'err' => $err]);
     }
 
     // カテゴリはDMCA報告、営業、税金、法律、又は無駄な話を選択したら、いつでも送信せず失敗します。
     if (str_contains($this->field['cat'], 'scam')) {
-      Storage::disk('public')->delete($this->field['filename']);
+      if (isset($this->field['gpg']) && !is_null($this->field['gpg']) && $this->field['gpg'] != '') {
+        Storage::disk('public')->delete($this->field['filename']);
+        $this->field['bunsyo'] = $r->bunsyo;
+      }
       return view('pages.site.contact', ['field' => $this->field, 'err' => ['送信に失敗しました。数時間後もう一回送信してみて下さい。']]);
     }
 
@@ -111,12 +117,17 @@ class Contact {
     try {
       $mail = new MailerController();
       if (!$mail->compose($this->field, true)) {
-        Storage::disk('public')->delete($this->field['filename']);
+        if (isset($this->field['gpg']) && !is_null($this->field['gpg']) && $this->field['gpg'] != '') {
+          Storage::disk('public')->delete($this->field['filename']);
+          $this->field['bunsyo'] = $r->bunsyo;
+        }
         return view('pages.site.contact', ['field' => $this->field, 'err' => ['送信に失敗しました。数時間後もう一回送信してみて下さい。']]);
       }
     } catch (\Throwable $e) {
-      Storage::disk('public')->delete($this->field['filename']);
-      $this->field['bunsyo'] = $r->bunsyo;
+      if (isset($this->field['gpg']) && !is_null($this->field['gpg']) && $this->field['gpg'] != '') {
+        Storage::disk('public')->delete($this->field['filename']);
+        $this->field['bunsyo'] = $r->bunsyo;
+      }
       Log::critical($e);
       return view('pages.site.contact', ['field' => $this->field, 'err' => ['送信に失敗しました。数時間後もう一回送信してみて下さい。']]);
     }