vict3459
/
Ekapp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anders 2020-09-08 14:12:29 +02:00
parent 720faac2ff 6c4fceb697
commit ee47ffc0ed
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
skolehjem/app/Helpers.php
View File

@ -27,6 +27,9 @@ class Helpers
} }
public static function sendNewsNotification(News $news, Collection $users){ 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) { foreach ($users as $user) {
$email = $user->email; $email = $user->email;
@ -35,10 +38,9 @@ class Helpers
else else
$subject = $news->subname; $subject = $news->subname;
$msg = "Hej " . $user->name_first . " ". $user->name_last . ".\n\nDer er kommet en ny nyhed i skolehjems appen! "; $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);
} }
} }
} }

2
skolehjem/resources/views/admin/users/forgot.blade.php
View File

@ -12,7 +12,7 @@
<form action="{{ route("users.forgot") }}" method="post"> <form action="{{ route("users.forgot") }}" method="post">
@csrf @csrf
<input class="appinput" type="email" name="email" placeholder="Email" required> <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> <button class="btn btn-dark" onclick="window.location.href = '{{ route("users.login") }}';">Tilbage</button>
</form> </form>
</main> </main>

3
skolehjem/resources/views/app/users/forgot.blade.php
View File

@ -12,8 +12,7 @@
<form action="{{ route('users.forgot') }}" method="post"> <form action="{{ route('users.forgot') }}" method="post">
@csrf @csrf
<input class="appinput" type="email" name="email" placeholder="Email" required> <input class="appinput" type="email" name="email" placeholder="Email" required>
{!! session()->get('errornosuchuser') !!} <input class="btn btn-dark" type="submit" value="Reset Password">
<input class="btn btn-dark" type="submit" value="Send reset mail">
<a class="btn btn-dark text-center" onclick="window.history.back()">Tilbage</a> <a class="btn btn-dark text-center" onclick="window.history.back()">Tilbage</a>
</form> </form>
</main> </main>