smtech /
canvashack
@@ -13,15 +13,15 @@ discard block |
||
| 13 | 13 | |
| 14 | 14 | /* prepare the toolbox */ |
| 15 | 15 | if (empty($_SESSION[Toolbox::class])) { |
| 16 | - $_SESSION[Toolbox::class] =& Toolbox::fromConfiguration(CONFIG_FILE); |
|
| 16 | + $_SESSION[Toolbox::class] =& Toolbox::fromConfiguration(CONFIG_FILE); |
|
| 17 | 17 | } |
| 18 | 18 | $toolbox =& $_SESSION[Toolbox::class]; |
| 19 | 19 | if (php_sapi_name() !== 'cli') { |
| 20 | - $toolbox->smarty_prependTemplateDir(__DIR__ . '/templates', basename(__DIR__)); |
|
| 21 | - $toolbox->smarty_assign([ |
|
| 22 | - 'category' => DataUtilities::titleCase(preg_replace('/[\-_]+/', ' ', basename(__DIR__))) |
|
| 23 | - ]); |
|
| 24 | - $smarty =& $toolbox->getSmarty(); |
|
| 20 | + $toolbox->smarty_prependTemplateDir(__DIR__ . '/templates', basename(__DIR__)); |
|
| 21 | + $toolbox->smarty_assign([ |
|
| 22 | + 'category' => DataUtilities::titleCase(preg_replace('/[\-_]+/', ' ', basename(__DIR__))) |
|
| 23 | + ]); |
|
| 24 | + $smarty =& $toolbox->getSmarty(); |
|
| 25 | 25 | } |
| 26 | 26 | |
| 27 | 27 | /* |
@@ -33,9 +33,9 @@ discard block |
||
| 33 | 33 | |
| 34 | 34 | /* set the Tool Consumer's instance URL, if present */ |
| 35 | 35 | if (empty($_SESSION[CANVAS_INSTANCE_URL])) { |
| 36 | - if (!empty($_SESSION[ToolProvider::class]['canvas']['api_domain'])) { |
|
| 37 | - $_SESSION[CANVAS_INSTANCE_URL] = 'https://' . $_SESSION[ToolProvider::class]['canvas']['api_domain']; |
|
| 38 | - } else { |
|
| 39 | - $_SESSION[CANVAS_INSTANCE_URL] = $toolbox->config('TOOL_CANVAS_API')['url']; |
|
| 40 | - } |
|
| 36 | + if (!empty($_SESSION[ToolProvider::class]['canvas']['api_domain'])) { |
|
| 37 | + $_SESSION[CANVAS_INSTANCE_URL] = 'https://' . $_SESSION[ToolProvider::class]['canvas']['api_domain']; |
|
| 38 | + } else { |
|
| 39 | + $_SESSION[CANVAS_INSTANCE_URL] = $toolbox->config('TOOL_CANVAS_API')['url']; |
|
| 40 | + } |
|
| 41 | 41 | } |
@@ -13,23 +13,23 @@ |
||
| 13 | 13 | |
| 14 | 14 | /* prepare the toolbox */ |
| 15 | 15 | if (empty($_SESSION[Toolbox::class])) { |
| 16 | - $_SESSION[Toolbox::class] =& Toolbox::fromConfiguration(CONFIG_FILE); |
|
| 16 | + $_SESSION[Toolbox::class] = & Toolbox::fromConfiguration(CONFIG_FILE); |
|
| 17 | 17 | } |
| 18 | -$toolbox =& $_SESSION[Toolbox::class]; |
|
| 18 | +$toolbox = & $_SESSION[Toolbox::class]; |
|
| 19 | 19 | if (php_sapi_name() !== 'cli') { |
| 20 | 20 | $toolbox->smarty_prependTemplateDir(__DIR__ . '/templates', basename(__DIR__)); |
| 21 | 21 | $toolbox->smarty_assign([ |
| 22 | 22 | 'category' => DataUtilities::titleCase(preg_replace('/[\-_]+/', ' ', basename(__DIR__))) |
| 23 | 23 | ]); |
| 24 | - $smarty =& $toolbox->getSmarty(); |
|
| 24 | + $smarty = & $toolbox->getSmarty(); |
|
| 25 | 25 | } |
| 26 | 26 | |
| 27 | 27 | /* |
| 28 | 28 | * FIXME convience variables until plugins are all updated |
| 29 | 29 | */ |
| 30 | -$api =& $toolbox->getAPI(); |
|
| 31 | -$sql =& $toolbox->getMySQL(); |
|
| 32 | -$customPrefs =& $toolbox->getCustomPrefs(); |
|
| 30 | +$api = & $toolbox->getAPI(); |
|
| 31 | +$sql = & $toolbox->getMySQL(); |
|
| 32 | +$customPrefs = & $toolbox->getCustomPrefs(); |
|
| 33 | 33 | |
| 34 | 34 | /* set the Tool Consumer's instance URL, if present */ |
| 35 | 35 | if (empty($_SESSION[CANVAS_INSTANCE_URL])) { |
