Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master

skolehjem/app/Http/Controllers/UserController.php

@@ -216,6 +216,8 @@ class UserController extends Controller
             return redirect()->back(303)->with('error#wrongcredentials', '<p class="text-center text-white"><b>Email eller Password matchede ikke!</b></p>');
         if (request()->cookie('languagesSetting') == "en")
             return redirect()->back(303)->with('error#wrongcredentials', '<p class="text-center text-white"><b>Wrong Email or Password!</b></p>');
+
+        return redirect()->back(303)->with('error#wrongcredentials', '<p class="text-center text-white"><b>Email eller Password matchede ikke!</b></p>');
     }
 
     public function logout(Request $request) {
@@ -225,6 +227,8 @@ class UserController extends Controller
             return redirect()->route("users.login")->with('success#loggedout', '<p class="text-center text-white"><b>Du er hermed logget ud!</b></p>');
         if (request()->cookie('languagesSetting') == "en")
             return redirect()->route("users.login")->with('success#loggedout', '<p class="text-center text-white"><b>You are logged out!</b></p>');
+
+        return redirect()->route("users.login")->with('success#loggedout', '<p class="text-center text-white"><b>Du er hermed logget ud!</b></p>');
     }
 
     /*******************************************/
@@ -301,11 +305,15 @@ class UserController extends Controller
                     return redirect()->route("users.accounteditpass")->with('error#notsamepass', '<p class="text-center"><b>Der stod ikke det samme i `Nyt Password` & `Confirm Password`!</b></p>');
                 elseif (request()->cookie('languagesSetting') == "en")
                     return redirect()->route("users.accounteditpass")->with('error#notsamepass', '<p class="text-center"><b>`New Password` & `Confirm Password` was not the same!</b></p>');
+                else
+                    return redirect()->route("users.accounteditpass")->with('error#notsamepass', '<p class="text-center"><b>Der stod ikke det samme i `Nyt Password` & `Confirm Password`!</b></p>');
             } elseif (!Hash::check($request->input('oldpassword'), $user->password)) { // If the written current password and current password in DB is not the same, go back with fail message.
                 if (request()->cookie('languagesSetting') == "dk")
                     return redirect()->route("users.accounteditpass")->with('error#oldpass', '<p class="text-center"><b>Det indtastede password i `Nuværende Password` er ikke dit nuværende password!</b></p>');
                 elseif (request()->cookie('languagesSetting') == "en")
                     return redirect()->route("users.accounteditpass")->with('error#oldpass', '<p class="text-center"><b>The entered `Current Password` was not the same as your current password!</b></p>');
+                else
+                    return redirect()->route("users.accounteditpass")->with('error#oldpass', '<p class="text-center"><b>Det indtastede password i `Nuværende Password` er ikke dit nuværende password!</b></p>');
             } else { // If new password and current password is the same AND current written and current DB password is the same. Then update and logout.
                 /** @var User $user */
                 $user->update($data);
@@ -315,6 +323,8 @@ class UserController extends Controller
                     return redirect()->route("users.login")->with('success#passwordchange', '<p class="text-center text-white"><b>Dit password er hermed ændret!</b></p>');
                 elseif (request()->cookie('languagesSetting') == "en")
                     return redirect()->route("users.login")->with('success#passwordchange', '<p class="text-center text-white"><b>Your password was changed successfully!</b></p>');
+                else
+                    return redirect()->route("users.login")->with('success#passwordchange', '<p class="text-center text-white"><b>Dit password er hermed ændret!</b></p>');
             }
         } else { // Else if you're not editing the password but anything else (Email, Phone Number). Then update user.
             $data = $request->only(['email', 'phone']);
@@ -324,6 +334,8 @@ class UserController extends Controller
                 return redirect()->route("users.account")->with('success#credentialschanged', '<p class="text-center"><b>Dine oplysninger er hermed ændret!</b></p>');
             elseif (request()->cookie('languagesSetting') == "en")
                 return redirect()->route("users.account")->with('success#credentialschanged', '<p class="text-center"><b>Your information has changed!</b></p>');
+            else
+                return redirect()->route("users.account")->with('success#credentialschanged', '<p class="text-center"><b>Dine oplysninger er hermed ændret!</b></p>');
         }
         $users = User::query()->paginate(20);
 

skolehjem/app/Http/Controllers/UserEventController.php

@@ -91,6 +91,8 @@ class UserEventController extends Controller
             return redirect()->route("userevents.index", [ "userevents" => $JoinedEvents ])->with('eventunsubscribed', '<p class="text-center"><b>Du er hermed afmeldt aktiviteten!</b></p>');
         if (request()->cookie('languagesSetting') == "en")
             return redirect()->route("userevents.index", [ "userevents" => $JoinedEvents ])->with('eventunsubscribed', '<p class="text-center"><b>You are no longer participating in this event!</b></p>');
+
+        return redirect()->route("userevents.index", [ "userevents" => $JoinedEvents ])->with('eventunsubscribed', '<p class="text-center"><b>Du er hermed afmeldt aktiviteten!</b></p>');
     }
 
     public function show()

skolehjem/app/Providers/AppServiceProvider.php

@@ -23,6 +23,7 @@ class AppServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        url()->forceScheme('https');
+        if(env('HTTPS_ONLY') == true)
+            url()->forceScheme('https');
     }
 }