@@ -5,7 +5,7 @@ |
||
5 | 5 | header('Content-Type: application/javascript'); |
6 | 6 | |
7 | 7 | if (!empty($_REQUEST['download'])) { |
8 | - header("Content-Disposition: attachment; filename=canvashack-loader.js"); |
|
8 | + header("Content-Disposition: attachment; filename=canvashack-loader.js"); |
|
9 | 9 | } |
10 | 10 | |
11 | 11 | ?> |
@@ -18,12 +18,12 @@ discard block |
||
18 | 18 | if ($this->user->isAdmin()) { |
19 | 19 | |
20 | 20 | /* set up any needed session variables */ |
21 | - $_SESSION['consumer_key'] = $this->consumer->getKey(); |
|
22 | - $_SESSION['resource_id'] = $this->resource_link->getId(); |
|
23 | - $_SESSION['user_consumer_key'] = $this->user->getResourceLink()->getConsumer()->getKey(); |
|
24 | - $_SESSION['user_id'] = $this->user->getId(); |
|
25 | - $_SESSION['isStudent'] = $this->user->isLearner(); |
|
26 | - $_SESSION['isContentItem'] = FALSE; |
|
21 | + $_SESSION['consumer_key'] = $this->consumer->getKey(); |
|
22 | + $_SESSION['resource_id'] = $this->resource_link->getId(); |
|
23 | + $_SESSION['user_consumer_key'] = $this->user->getResourceLink()->getConsumer()->getKey(); |
|
24 | + $_SESSION['user_id'] = $this->user->getId(); |
|
25 | + $_SESSION['isStudent'] = $this->user->isLearner(); |
|
26 | + $_SESSION['isContentItem'] = FALSE; |
|
27 | 27 | |
28 | 28 | /* do we have an admin API access token? */ |
29 | 29 | $haveToken = true; |
@@ -52,10 +52,10 @@ discard block |
||
52 | 52 | } |
53 | 53 | $_SESSION['apiUrl'] = 'https://' . $this->user->getResourceLink()->settings['custom_canvas_api_domain'] . '/api/v1'; |
54 | 54 | |
55 | - /* pass control off to the app */ |
|
56 | - if ($haveToken) { |
|
57 | - $this->redirectURL = "{$metadata['APP_URL']}/app.php?lti-request=launch"; |
|
58 | - } |
|
55 | + /* pass control off to the app */ |
|
56 | + if ($haveToken) { |
|
57 | + $this->redirectURL = "{$metadata['APP_URL']}/app.php?lti-request=launch"; |
|
58 | + } |
|
59 | 59 | |
60 | 60 | /* ...otherwise set an appropriate error message and fail */ |
61 | 61 | } else { |