@@ -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 { |
@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | if (empty($_SESSION[Toolbox::class])) { |
16 | 16 | $_SESSION[Toolbox::class] = Toolbox::fromConfiguration(CONFIG_FILE); |
17 | 17 | } |
18 | -$toolbox =& $_SESSION[Toolbox::class]; |
|
18 | +$toolbox = & $_SESSION[Toolbox::class]; |
|
19 | 19 | |
20 | 20 | /* identify the tool's Canvas instance URL */ |
21 | 21 | if (empty($_SESSION[CANVAS_INSTANCE_URL])) { |
@@ -45,10 +45,10 @@ discard block |
||
45 | 45 | ]); |
46 | 46 | |
47 | 47 | // FIXME convenience variable |
48 | - $smarty =& $toolbox->getSmarty(); |
|
48 | + $smarty = & $toolbox->getSmarty(); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | // FIXME convience variables until plugins are all updated |
52 | -$api =& $toolbox->getAPI(); |
|
53 | -$sql =& $toolbox->getMySQL(); |
|
54 | -$customPrefs =& $toolbox->getCustomPrefs(); |
|
52 | +$api = & $toolbox->getAPI(); |
|
53 | +$sql = & $toolbox->getMySQL(); |
|
54 | +$customPrefs = & $toolbox->getCustomPrefs(); |