From 6c4fceb697c0f0f635f416d82b2026a068f8c1e6 Mon Sep 17 00:00:00 2001
From: frederikpyt <frederikpyt@gmail.com>
Date: Tue, 8 Sep 2020 08:48:30 +0200
Subject: [PATCH] v0.12.3 - Fixed reset password and email charset

---
 skolehjem/app/Helpers.php                              | 6 ++++--
 skolehjem/resources/views/admin/users/forgot.blade.php | 2 +-
 skolehjem/resources/views/app/users/forgot.blade.php   | 3 +--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/skolehjem/app/Helpers.php b/skolehjem/app/Helpers.php
index f419636..e3701ba 100644
--- a/skolehjem/app/Helpers.php
+++ b/skolehjem/app/Helpers.php
@@ -27,6 +27,9 @@ class Helpers
     }
 
     public static function sendNewsNotification(News $news, Collection $users){
+        $headers = 'Content-Transfer-Encoding: 8bit'. "\r\n".
+                   'Content-Type: text/html; charset="UTF-8"';
+
         foreach ($users as $user) {
             $email = $user->email;
 
@@ -35,10 +38,9 @@ class Helpers
             else
                 $subject = $news->subname;
 
-
             $msg = "Hej " . $user->name_first . " ". $user->name_last . ".\n\nDer er kommet en ny nyhed i skolehjems appen! ";
 
-            mail($email, $subject, $msg);
+            mail($email, $subject, $msg, $headers);
         }
     }
 }
diff --git a/skolehjem/resources/views/admin/users/forgot.blade.php b/skolehjem/resources/views/admin/users/forgot.blade.php
index ae29260..4fe1936 100644
--- a/skolehjem/resources/views/admin/users/forgot.blade.php
+++ b/skolehjem/resources/views/admin/users/forgot.blade.php
@@ -12,7 +12,7 @@
         <form action="{{ route("users.forgot") }}" method="post">
             @csrf
             <input class="appinput" type="email" name="email" placeholder="Email" required>
-            <input class="btn btn-dark" type="submit" value="Send reset mail">
+            <input class="btn btn-dark" type="submit" value="Reset Password">
             <button class="btn btn-dark" onclick="window.location.href = '{{ route("users.login") }}';">Tilbage</button>
         </form>
     </main>
diff --git a/skolehjem/resources/views/app/users/forgot.blade.php b/skolehjem/resources/views/app/users/forgot.blade.php
index 617cf4d..310de27 100644
--- a/skolehjem/resources/views/app/users/forgot.blade.php
+++ b/skolehjem/resources/views/app/users/forgot.blade.php
@@ -12,8 +12,7 @@
         <form action="{{ route('users.forgot') }}" method="post">
             @csrf
             <input class="appinput" type="email" name="email" placeholder="Email" required>
-            {!! session()->get('errornosuchuser') !!}
-            <input class="btn btn-dark" type="submit" value="Send reset mail">
+            <input class="btn btn-dark" type="submit" value="Reset Password">
             <a class="btn btn-dark text-center" onclick="window.history.back()">Tilbage</a>
         </form>
     </main>