Completed
Push — develop ( 48407c...953cbd )
by Seth
02:30
created
src/CanvasHack.php 1 patch
Spacing   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -134,13 +134,11 @@
 block discarded – undo
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
 
Please login to merge, or discard this patch.
index.php 1 patch
Spacing   +3 added lines, -5 removed lines patch added patch discarded remove patch
@@ -13,8 +13,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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 {
Please login to merge, or discard this patch.
common.inc.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -13,23 +13,23 @@
 block discarded – undo
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(); // FIXME
24
+     $smarty = & $toolbox->getSmarty(); // FIXME
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]) &&
Please login to merge, or discard this patch.