diff options
Diffstat (limited to 'main/app/sprinkles/core')
4 files changed, 10 insertions, 21 deletions
diff --git a/main/app/sprinkles/core/assets/SiteAssets/js/chat.js b/main/app/sprinkles/core/assets/SiteAssets/js/chat.js index 82cae93..ebf549b 100644 --- a/main/app/sprinkles/core/assets/SiteAssets/js/chat.js +++ b/main/app/sprinkles/core/assets/SiteAssets/js/chat.js @@ -15,6 +15,7 @@ function InitializeChatServer() { }, 5000); }; ChatSocket.onopen = function () { + ChatSocket.send(JSON.stringify({ClientMessageType: "Verify", Cookie: document.cookie})); // CONNECTION SUCCESSFUL! console.log("[WEBSOCKET LOGGER] Chat connection established!"); // GOT MESSAGE diff --git a/main/app/sprinkles/core/assets/SiteAssets/php/Chatserver/src/ChatProcessor.php b/main/app/sprinkles/core/assets/SiteAssets/php/Chatserver/src/ChatProcessor.php index f3793e2..1385f19 100644 --- a/main/app/sprinkles/core/assets/SiteAssets/php/Chatserver/src/ChatProcessor.php +++ b/main/app/sprinkles/core/assets/SiteAssets/php/Chatserver/src/ChatProcessor.php @@ -29,21 +29,6 @@ class ChatProcessor implements MessageComponentInterface $this->connectedUsersNames[$conn->resourceId] = $generator->getName(); } - /*public function onMessage(ConnectionInterface $from, $msg) { - $numRecv = count($this->clients) - 1; - echo sprintf('Connection %d sending message "%s" to %d other connection%s' . "\n" - , $from->resourceId, $msg, $numRecv, $numRecv == 1 ? '' : 's'); - - foreach ($this->clients as $client) { - if ($from === $client) { - $client->send("<b>You</b> - " . $msg); - } else { - $client->send("<b>" . $from->resourceId . "</b> - " . $msg); - } - } - } - */ - public function onMessage(ConnectionInterface $conn, MessageInterface $msg) { $data = json_decode($msg); switch ($data->ClientMessageType) { @@ -109,6 +94,9 @@ class ChatProcessor implements MessageComponentInterface } } break; + case "Verify": + print_r($data); + break; } } diff --git a/main/app/sprinkles/core/config/default.php b/main/app/sprinkles/core/config/default.php index c829121..07fd2e6 100644 --- a/main/app/sprinkles/core/config/default.php +++ b/main/app/sprinkles/core/config/default.php @@ -115,7 +115,7 @@ ], // Slim settings - see http://www.slimframework.com/docs/objects/application.html#slim-default-settings 'settings' => [ - 'displayErrorDetails' => false + 'displayErrorDetails' => true ], // "Site" settings that are automatically passed to Twig 'site' => [ @@ -178,6 +178,6 @@ 'display_errors' => 'false', 'log_errors' => 'true', // Let PHP itself render errors natively. Useful if a fatal error is raised in our custom shutdown handler. - 'display_errors_native' => 'false' + 'display_errors_native' => 'true' ] ]; diff --git a/main/app/sprinkles/core/src/ServicesProvider/ServicesProvider.php b/main/app/sprinkles/core/src/ServicesProvider/ServicesProvider.php index c67b886..62d8382 100644 --- a/main/app/sprinkles/core/src/ServicesProvider/ServicesProvider.php +++ b/main/app/sprinkles/core/src/ServicesProvider/ServicesProvider.php @@ -82,7 +82,7 @@ class ServicesProvider if ($config['alert.storage'] == 'cache') { return new CacheAlertStream($config['alert.key'], $c->translator, $c->cache, $c->config); - } elseif ($config['alert.storage'] == 'session') { + } else if ($config['alert.storage'] == 'session') { return new SessionAlertStream($config['alert.key'], $c->translator, $c->session); } else { throw new \Exception("Bad alert storage handler type '{$config['alert.storage']}' specified in configuration file."); @@ -158,11 +158,11 @@ class ServicesProvider if ($config['cache.driver'] == 'file') { $path = $c->locator->findResource('cache://', TRUE, TRUE); $cacheStore = new TaggableFileStore($path); - } elseif ($config['cache.driver'] == 'memcached') { + } else if ($config['cache.driver'] == 'memcached') { // We need to inject the prefix in the memcached config $config = array_merge($config['cache.memcached'], ['prefix' => $config['cache.prefix']]); $cacheStore = new MemcachedStore($config); - } elseif ($config['cache.driver'] == 'redis') { + } else if ($config['cache.driver'] == 'redis') { // We need to inject the prefix in the redis config $config = array_merge($config['cache.redis'], ['prefix' => $config['cache.prefix']]); $cacheStore = new RedisStore($config); @@ -512,7 +512,7 @@ class ServicesProvider if ($config['session.handler'] == 'file') { $fs = new FileSystem; $handler = new FileSessionHandler($fs, $c->locator->findResource('session://'), $config['session.minutes']); - } elseif ($config['session.handler'] == 'database') { + } else if ($config['session.handler'] == 'database') { $connection = $c->db->connection(); // Table must exist, otherwise an exception will be thrown $handler = new DatabaseSessionHandler($connection, $config['session.database.table'], $config['session.minutes']); |