Moar progress on web socket

tsugiproject · Aug 1, 2018 · bab4fcd · bab4fcd
1 parent 2d7e660
commit bab4fcd
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/UI/Output.php b/src/UI/Output.php
@@ -110,7 +110,7 @@ function flashMessages() {
      */
     function header() {
         global $HEAD_CONTENT_SENT, $CFG, $RUNNING_IN_TOOL, $CONTEXT, $USER, $LINK;
-        global $CFG;
+
         if ( $HEAD_CONTENT_SENT === true ) return;
         header('Content-Type: text/html; charset=utf-8');
         ob_start();
@@ -149,8 +149,8 @@ function header() {
             rest_path: <?= json_encode(U::rest_path()) ?>,
             spinnerUrl: "<?= self::getSpinnerUrl() ?>",
             staticroot: "<?= $CFG->staticroot ?>",
-            websocket_url: <?= WebSocket::enabled() ? '"'.$CFG->websocket_url.'"' : 'false' ?>,
-            websocket_token: <?= WebSocket::enabled() ? '"'.WebSocket::getToken().'"' : 'false' ?>,
+            websocket_url: <?= WebSocket::enabled() && $LINK ? '"'.$CFG->websocket_url.'"' : 'false' ?>,
+            websocket_token: <?= WebSocket::enabled() && $LINK ? '"'.WebSocket::getToken($LINK->launch).'"' : 'false' ?>,
             window_close_message: "<?= _m('Application complete') ?>",
             session_expire_message: "<?= _m('Your session has expired') ?>"
         }