@@ -134,13 +134,11 @@ |
||
134 | 134 | $_name = $this->sql->real_escape_string($this->name); |
135 | 135 | $_abstract = ( |
136 | 136 | isset($this->abstract) ? |
137 | - $this->sql->real_escape_string($this->abstract) : |
|
138 | - $this->sql->real_escape_string($this->description) |
|
137 | + $this->sql->real_escape_string($this->abstract) : $this->sql->real_escape_string($this->description) |
|
139 | 138 | ); |
140 | 139 | $_description = ( |
141 | 140 | isset($this->description) ? |
142 | - $this->sql->real_escape_string($this->description) : |
|
143 | - $this->sql->real_escape_string($this->abstract) |
|
141 | + $this->sql->real_escape_string($this->description) : $this->sql->real_escape_string($this->abstract) |
|
144 | 142 | ); |
145 | 143 | $_path = $this->sql->real_escape_string($this->path); |
146 | 144 |
@@ -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! */ |
@@ -37,8 +36,7 @@ discard block |
||
37 | 36 | /* if not authenticated, default to showing credentials */ |
38 | 37 | } else { |
39 | 38 | $action = (empty($action) ? |
40 | - ACTION_CONFIG : |
|
41 | - $action |
|
39 | + ACTION_CONFIG : $action |
|
42 | 40 | ); |
43 | 41 | } |
44 | 42 | |
@@ -47,7 +45,7 @@ discard block |
||
47 | 45 | /* reset cached install data from config file */ |
48 | 46 | case ACTION_INSTALL: |
49 | 47 | $_SESSION['toolbox'] = Toolbox::fromConfiguration(CONFIG_FILE, true); |
50 | - $toolbox =& $_SESSION['toolbox']; |
|
48 | + $toolbox = & $_SESSION['toolbox']; |
|
51 | 49 | |
52 | 50 | /* test to see if we can connect to the API */ |
53 | 51 | try { |
@@ -17,15 +17,15 @@ discard block |
||
17 | 17 | |
18 | 18 | /* prepare the toolbox */ |
19 | 19 | if (empty($_SESSION[Toolbox::class])) { |
20 | - $_SESSION[Toolbox::class] =& Toolbox::fromConfiguration(CONFIG_FILE); |
|
20 | + $_SESSION[Toolbox::class] = & Toolbox::fromConfiguration(CONFIG_FILE); |
|
21 | 21 | } |
22 | -$toolbox =& $_SESSION[Toolbox::class]; |
|
22 | +$toolbox = & $_SESSION[Toolbox::class]; |
|
23 | 23 | if (php_sapi_name() !== 'cli') { |
24 | 24 | $toolbox->smarty_prependTemplateDir(__DIR__ . '/templates', basename(__DIR__)); |
25 | 25 | $toolbox->smarty_assign([ |
26 | 26 | 'category' => DataUtilities::titleCase(preg_replace('/[\-_]+/', ' ', basename(__DIR__))) |
27 | 27 | ]); |
28 | - $smarty =& $toolbox->getSmarty(); |
|
28 | + $smarty = & $toolbox->getSmarty(); |
|
29 | 29 | } |
30 | 30 | |
31 | 31 | /* set the Tool Consumer's instance URL, if present */ |
@@ -46,6 +46,6 @@ discard block |
||
46 | 46 | * FIXME convience variables until plugins are all updated (must come after the |
47 | 47 | * instance URL detection, so that the API URL is set correctly) |
48 | 48 | */ |
49 | -$api =& $toolbox->getAPI(); |
|
50 | -$sql =& $toolbox->getMySQL(); |
|
51 | -$customPrefs =& $toolbox->getCustomPrefs(); |
|
49 | +$api = & $toolbox->getAPI(); |
|
50 | +$sql = & $toolbox->getMySQL(); |
|
51 | +$customPrefs = & $toolbox->getCustomPrefs(); |