@@ -13,8 +13,7 @@ discard block |
||
13 | 13 | |
14 | 14 | /* store any requested actions for future handling */ |
15 | 15 | $action = (empty($_REQUEST['action']) ? |
16 | - ACTION_UNSPECIFIED : |
|
17 | - strtolower($_REQUEST['action']) |
|
16 | + ACTION_UNSPECIFIED : strtolower($_REQUEST['action']) |
|
18 | 17 | ); |
19 | 18 | |
20 | 19 | /* action requests only come from outside the LTI! */ |
@@ -49,8 +48,7 @@ discard block |
||
49 | 48 | /* if not authenticated, default to showing credentials */ |
50 | 49 | } else { |
51 | 50 | $action = (empty($action) ? |
52 | - ACTION_CONFIG : |
|
53 | - $action |
|
51 | + ACTION_CONFIG : $action |
|
54 | 52 | ); |
55 | 53 | } |
56 | 54 | |
@@ -59,7 +57,7 @@ discard block |
||
59 | 57 | /* reset cached install data from config file */ |
60 | 58 | case ACTION_INSTALL: |
61 | 59 | $_SESSION['toolbox'] = Toolbox::fromConfiguration(CONFIG_FILE, true); |
62 | - $toolbox =& $_SESSION['toolbox']; |
|
60 | + $toolbox = & $_SESSION['toolbox']; |
|
63 | 61 | |
64 | 62 | /* test to see if we can connect to the API */ |
65 | 63 | try { |
@@ -3,27 +3,27 @@ |
||
3 | 3 | require_once('common.inc.php'); |
4 | 4 | |
5 | 5 | if (isset($_REQUEST['course_url'])) { |
6 | - $courseId = preg_replace('|.*/courses/(\d+)/?.*|', '$1', parse_url($_REQUEST['course_url'], PHP_URL_PATH)); |
|
7 | - $course = $api->get("/courses/$courseId"); |
|
8 | - if ($course) { |
|
9 | - $webcalFeed = str_replace('https://', 'webcal://', $course['calendar']['ics']); |
|
10 | - $smarty->assign('content', ' |
|
6 | + $courseId = preg_replace('|.*/courses/(\d+)/?.*|', '$1', parse_url($_REQUEST['course_url'], PHP_URL_PATH)); |
|
7 | + $course = $api->get("/courses/$courseId"); |
|
8 | + if ($course) { |
|
9 | + $webcalFeed = str_replace('https://', 'webcal://', $course['calendar']['ics']); |
|
10 | + $smarty->assign('content', ' |
|
11 | 11 | <h3>Course Calendar ICS Feed</h3> |
12 | 12 | <p>You can subscribe to the calendar for <a href="https://' . |
13 | - parse_url(CANVAS_API_URL, PHP_URL_HOST) . '/courses/' . $courseId . |
|
14 | - '">' . $course['name'] . '</a> at <a href="' . |
|
15 | - $webcalFeed . '">' . $webcalFeed . |
|
16 | - '</a> in any calendar application that supports external ICS feeds.</p>' |
|
17 | - ); |
|
18 | - } else { |
|
19 | - $messages[] = array( |
|
20 | - 'class' => 'error', |
|
21 | - 'title' => 'Canvas API Error', |
|
22 | - 'content' => 'The course you requested could not be accessed.<pre>' . print_r($json, false) . '</pre>' |
|
23 | - ); |
|
24 | - } |
|
13 | + parse_url(CANVAS_API_URL, PHP_URL_HOST) . '/courses/' . $courseId . |
|
14 | + '">' . $course['name'] . '</a> at <a href="' . |
|
15 | + $webcalFeed . '">' . $webcalFeed . |
|
16 | + '</a> in any calendar application that supports external ICS feeds.</p>' |
|
17 | + ); |
|
18 | + } else { |
|
19 | + $messages[] = array( |
|
20 | + 'class' => 'error', |
|
21 | + 'title' => 'Canvas API Error', |
|
22 | + 'content' => 'The course you requested could not be accessed.<pre>' . print_r($json, false) . '</pre>' |
|
23 | + ); |
|
24 | + } |
|
25 | 25 | } else { |
26 | - $smarty->assign('content', ' |
|
26 | + $smarty->assign('content', ' |
|
27 | 27 | <form method="post" action="' . $_SERVER['PHP_SELF'] . '"> |
28 | 28 | <label for="course_url">Course URL <span class="comment">The URL to the course whose calendar you would like to export as an ICS feed</span></label> |
29 | 29 | <input id="course_url" name="course_url" type="text" /> |
@@ -13,7 +13,7 @@ |
||
13 | 13 | if (empty($_SESSION[Toolbox::class])) { |
14 | 14 | $_SESSION[Toolbox::class] = Toolbox::fromConfiguration(CONFIG_FILE); |
15 | 15 | } |
16 | -$toolbox =& $_SESSION[Toolbox::class]; |
|
16 | +$toolbox = & $_SESSION[Toolbox::class]; |
|
17 | 17 | if (!defined('IGNORE_LTI')) { |
18 | 18 | $toolbox->smarty_prependTemplateDir(__DIR__ . '/templates', basename(__DIR__)); |
19 | 19 | $toolbox->smarty_assign([ |