@@ -20,7 +20,7 @@ discard block |
||
20 | 20 | /** |
21 | 21 | * Generate a SECRETS_FILE from user input. |
22 | 22 | * |
23 | - * @param scalar $step optional Where are we in the SECRETS_FILE creation workflow? (defaults to SECRETS_NEEDED_STEP -- the beginning) |
|
23 | + * @param integer $step optional Where are we in the SECRETS_FILE creation workflow? (defaults to SECRETS_NEEDED_STEP -- the beginning) |
|
24 | 24 | * |
25 | 25 | * @throws CanvasAPIviaLTI_Installer_Exception If form submission does not contain all required MySQL credentals (host, username, password and database) |
26 | 26 | * @throws CanvasAPIviaLTI_Installer_Exception If SECRETS_FILE cannot be created |
@@ -261,7 +261,7 @@ discard block |
||
261 | 261 | /** |
262 | 262 | * Obtain a Canvas API token, if needed. |
263 | 263 | * |
264 | - * @param scalar $step optional Where are we in the API token negotiation workflow? (defaults to API_DECISION_NEEDED_STEP -- the beginning) |
|
264 | + * @param integer $step optional Where are we in the API token negotiation workflow? (defaults to API_DECISION_NEEDED_STEP -- the beginning) |
|
265 | 265 | * @param boolean $skip optional Skip this step (defaults to FALSE) |
266 | 266 | * |
267 | 267 | * @throws CanvasAPIviaLTI_Installer_Exception If $step is not a pre-defined *_STEP constant |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | } |
92 | 92 | |
93 | 93 | /** |
94 | - * @return string|boolean The API access token for this user, or FALSE if no token has been acquired |
|
94 | + * @return string|false The API access token for this user, or FALSE if no token has been acquired |
|
95 | 95 | **/ |
96 | 96 | public function getToken() { |
97 | 97 | if ($this->token) { |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | } |
134 | 134 | |
135 | 135 | /** |
136 | - * @return string|boolean The URL of the API for which the user's API token is valid, or FALSE if no token has been acquired |
|
136 | + * @return string|false The URL of the API for which the user's API token is valid, or FALSE if no token has been acquired |
|
137 | 137 | **/ |
138 | 138 | function getAPIUrl() { |
139 | 139 | if ($this->apiUrl) { |
@@ -47,10 +47,11 @@ |
||
47 | 47 | /* look up consumer to edit, if requested */ |
48 | 48 | } elseif (isset($_REQUEST['consumer_key'])) { |
49 | 49 | $consumer = new LTI_Tool_Consumer($_REQUEST['consumer_key'], LTI_Data_Connector::getDataConnector($sql)); |
50 | - if (isset($_REQUEST['action'])) |
|
51 | - switch ($_REQUEST['action']) { |
|
50 | + if (isset($_REQUEST['action'])) { |
|
51 | + switch ($_REQUEST['action']) { |
|
52 | 52 | case 'delete': { |
53 | 53 | $consumer->delete(); |
54 | + } |
|
54 | 55 | break; |
55 | 56 | } |
56 | 57 | case 'select': { |
@@ -305,7 +305,9 @@ discard block |
||
305 | 305 | ), false) . '</pre>', |
306 | 306 | NotificationMessage::ERROR |
307 | 307 | ); |
308 | - if (php_sapi_name() != 'cli') $smarty->display('page.tpl'); |
|
308 | + if (php_sapi_name() != 'cli') { |
|
309 | + $smarty->display('page.tpl'); |
|
310 | + } |
|
309 | 311 | exit; |
310 | 312 | } |
311 | 313 | $sql->query(" |
@@ -421,7 +423,9 @@ discard block |
||
421 | 423 | 'The Canvas URL you submitted could not be parsed.<pre>' . $_REQUEST['canvas_url'] . '</pre>', |
422 | 424 | NotificationMessage::ERROR |
423 | 425 | ); |
424 | - if (php_sapi_name() != 'cli') $smarty->display('page.tpl'); |
|
426 | + if (php_sapi_name() != 'cli') { |
|
427 | + $smarty->display('page.tpl'); |
|
428 | + } |
|
425 | 429 | exit; |
426 | 430 | } |
427 | 431 | } |