diff --git a/app/Http/Controllers/MessageController.php b/app/Http/Controllers/MessageController.php
index ab198d2..270bcfd 100644
--- a/app/Http/Controllers/MessageController.php
+++ b/app/Http/Controllers/MessageController.php
@@ -31,9 +31,30 @@ class MessageController extends Controller
return view('messages.deleted')->with('messages', $messages);
}
- public function compose()
+ public function compose(Request $request)
{
- return view('messages.create');
+ $replyName = "";
+ $replySubject = "RE: ";
+ $replyContent = "\n\n\n-------------------------------------\n";
+
+ if ($request->has('replyTo')) {
+ $id = $request->replyTo;
+ $message = Message::findOrFail($id);
+ if ($message->sendto_id != Auth::id()) {
+ abort(404);
+ }
+ $replyName = $message->user->name;
+ $replySubject .= $message->subject;
+ $replyContent .= "On " . $message->created_at->format('F d, Y') . " " . $replyName . " wrote: \n" . $message->content;
+ }
+
+ $data = [
+ 'replyName' => $replyName,
+ 'replySubject' => $replySubject,
+ 'replyContent' => $replyContent,
+ ];
+
+ return view('messages.create')->with($data);
}
public function delete_all()
diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php
index 1c7bee4..4182124 100644
--- a/app/Http/Controllers/PageController.php
+++ b/app/Http/Controllers/PageController.php
@@ -75,7 +75,7 @@ class PageController extends Controller
if ($request->has('q')) {
$users = User::where('name', 'LIKE', '%' . $request->q . '%')->paginate(10);
} else {
- $users = User::paginate(10);
+ $users = User::latest('last_seen')->paginate(10);
}
return view('pages.users')->with('users', $users);
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index e48ca75..43b72d2 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -55,7 +55,7 @@
-
+
@if (Route::has('password.request'))
An Invite Key is required to sign up. You can obtain one from a person that has played ARCHBLOX.
Don't beg for keys.
-
+