aboutsummaryrefslogtreecommitdiffhomepage
path: root/main/app/sprinkles/admin/src/Controller/WormholeController.php
diff options
context:
space:
mode:
authorMarvin Borner2018-05-07 17:05:57 +0200
committerMarvin Borner2018-05-07 17:05:57 +0200
commit40f3846c01848f851078e809aac4b9268036f4b2 (patch)
tree1cf207e078c4b922456d3af8ccd9e8bb4794cc03 /main/app/sprinkles/admin/src/Controller/WormholeController.php
parent166ada98615ef84db1996df72a7400a3421d8cc3 (diff)
Added chat push notifications using serverside user data
Diffstat (limited to 'main/app/sprinkles/admin/src/Controller/WormholeController.php')
-rw-r--r--main/app/sprinkles/admin/src/Controller/WormholeController.php26
1 files changed, 19 insertions, 7 deletions
diff --git a/main/app/sprinkles/admin/src/Controller/WormholeController.php b/main/app/sprinkles/admin/src/Controller/WormholeController.php
index 31a44c1..7c35e55 100644
--- a/main/app/sprinkles/admin/src/Controller/WormholeController.php
+++ b/main/app/sprinkles/admin/src/Controller/WormholeController.php
@@ -42,7 +42,7 @@ class WormholeController extends SimpleController
$session_id = $args['session_id'];
$session_file = file_get_contents("../app/sessions/" . $session_id);
$session_user_id = unserialize(substr($session_file, strpos($session_file, "account|") + 8))["current_user_id"];
- if ($session_user_id === $user_id) {
+ if ($session_user_id == $user_id) {
return $response->withStatus(200);
} else {
throw new NotFoundException();
@@ -52,7 +52,7 @@ class WormholeController extends SimpleController
}
}
- public function getUsername(Request $request, Response $response, $args) {
+ public function getInfo(Request $request, Response $response, $args) {
$currentUser = $this->ci->currentUser; // FOR DATABASE QUERY
$access_token = $args['access_token'];
@@ -60,11 +60,23 @@ class WormholeController extends SimpleController
->where('UserID', 1)
->where('Key', '=', $access_token)
->exists()) {
- $user_id = $args['user_id'];
- $username =(DB::table('users')
- ->where('id', $user_id)
- ->value('user_name'));
- $response->write($username);
+ $classMapper = $this->ci->classMapper;
+ $user = DB::table('users')
+ ->where('id', $args["user_id"])
+ ->first();
+ if (!$user) {
+ throw new NotFoundException($request, $response);
+ }
+ $classMapper = $this->ci->classMapper;
+ $user = $classMapper->createInstance('user')
+ ->where('user_name', $user->user_name)
+ ->joinLastActivity()
+ ->with('lastActivity', 'group')
+ ->first();
+
+ $result = $user->toArray();
+ $result["avatar"] = $user->avatar;
+ return $response->withJson($result, 200, JSON_PRETTY_PRINT);
} else {
throw new NotFoundException(); // IT'S A FORBIDDEN EXCEPTION BUT IT'S SECRET! PSSSHT
}