smtech / canvashack

canvashack-loader.js.php

Indentation +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 header('Content-Type: application/javascript');
 
 if (!empty($_REQUEST['download'])) {
-    header("Content-Disposition: attachment; filename=canvashack-loader.js");
+	header("Content-Disposition: attachment; filename=canvashack-loader.js");
 }
 
 ?>

canvashack.js.php

Indentation +23 added lines, -23 removed lines

@@ -5,16 +5,16 @@ 
 
 function canonicalNamespaceId($id)
 {
-    return preg_replace('/[^a-z0-9]+/i', '_', $id);
+	return preg_replace('/[^a-z0-9]+/i', '_', $id);
 }
 
 function canvasHackNamespace($id, $javascript)
 {
-    return preg_replace(
-        '/^(\s*var\s+)?canvashack\s*=\s*{\n*(.*)};/is',
-        canonicalNamespaceId($id) . ": {\n$2\n}",
-        $javascript
-    );
+	return preg_replace(
+		'/^(\s*var\s+)?canvashack\s*=\s*{\n*(.*)};/is',
+		canonicalNamespaceId($id) . ": {\n$2\n}",
+		$javascript
+	);
 }
 
 header('Content-Type: application/javascript');
@@ -36,14 +36,14 @@ 
             p.`include` DESC
 ");
 while ($page = $enabledPages->fetch_assoc()) {
-    if ((!empty($page['url']) && $page['url'] == $_REQUEST['location']) ||
-        (!empty($page['pattern']) && preg_match($page['pattern'], $_REQUEST['location']))) {
-        if ($page['include']) {
-            $canvashacks[$page['canvashack']] = true;
-        } else {
-            unset($canvashacks[$page['canvashack']]);
-        }
-    }
+	if ((!empty($page['url']) && $page['url'] == $_REQUEST['location']) ||
+		(!empty($page['pattern']) && preg_match($page['pattern'], $_REQUEST['location']))) {
+		if ($page['include']) {
+			$canvashacks[$page['canvashack']] = true;
+		} else {
+			unset($canvashacks[$page['canvashack']]);
+		}
+	}
 }
 
 $dom = array();
@@ -53,12 +53,12 @@ 
         WHERE
             `canvashack` = '" . implode("' OR `canvashack` = '", array_keys($canvashacks)) . "'
 ")) == false) {
-    exit;
+	exit;
 }
 while ($entry = $applicableDOM->fetch_assoc()) {
-    $dom[$entry['canvashack']] = "$('{$entry['selector']}').{$entry['event']}(" .
-        (empty($entry['action']) ? '' : "this." . canonicalNamespaceId($entry['canvashack']) .
-        ".{$entry['action']}") . ");";
+	$dom[$entry['canvashack']] = "$('{$entry['selector']}').{$entry['event']}(" .
+		(empty($entry['action']) ? '' : "this." . canonicalNamespaceId($entry['canvashack']) .
+		".{$entry['action']}") . ");";
 }
 
 $javascript = array('go' => 'go: function() {
@@ -72,13 +72,13 @@ 
         WHERE
             `canvashack` = '" . implode("' OR `canvashack` = '", array_keys($canvashacks)) . "'
 ")) == false) {
-    exit;
+	exit;
 }
 while ($entry = $response->fetch_assoc()) {
-    $javascript[$entry['canvashack']] = canvasHackNamespace(
-        $entry['canvashack'],
-        shell_exec("php \"{$entry['path']}\" \"" . addslashes(serialize($_REQUEST)) . "\" 2>&1")
-    );
+	$javascript[$entry['canvashack']] = canvasHackNamespace(
+		$entry['canvashack'],
+		shell_exec("php \"{$entry['path']}\" \"" . addslashes(serialize($_REQUEST)) . "\" 2>&1")
+	);
 }
 
 ?>

hacks/common.inc.php

Indentation +1 added lines, -1 removed lines

@@ -5,5 +5,5 @@
 require_once(__DIR__ . '/../common.inc.php');
 
 if (empty($_REQUEST)) {
-    $_REQUEST = unserialize($argv[1]);
+	$_REQUEST = unserialize($argv[1]);
 }

src/CanvasHack.php

Indentation +313 added lines, -313 removed lines

@@ -12,165 +12,165 @@ 
 class CanvasHack
 {
 
-    private $sql;
-
-    private $path;
-
-    private $table = 'canvashacks';
-    private $css = 'css';
-    private $javascript = 'javascript';
-    private $pages = 'pages';
-    private $dom = 'dom';
-
-    private $id = null;
-    private $name = null;
-    private $abstract = null;
-    private $description = null;
-
-    public function __construct($sql, $path)
-    {
-
-        if ($sql instanceof \mysqli) {
-            $this->sql = $sql;
-        } else {
-            throw new CanvasHack_Exception(
-                'Expected mysqli object, received ' . get_class($sql),
-                CanvasHack_Exception::MYSQL
-            );
-        }
-
-        if (file_exists($path) && file_exists($manifest = realpath("$path/manifest.xml"))) {
-            $this->path = dirname($manifest);
-            $this->parseManifest($manifest);
-            $pluginMetadata = new \Battis\AppMetadata($this->sql, $this->id);
-            $pluginMetadata['PLUGIN_PATH'] = $path;
-            $pluginMetadata['PLUGIN_URL'] = (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != 'on' ? 'http://' : 'https://') . $_SERVER['SERVER_NAME'] . preg_replace("|^{$_SERVER['DOCUMENT_ROOT']}(.*)$|", '$1', $pluginMetadata['PLUGIN_PATH']);
-        } else {
-            if (isset($manifest)) {
-                throw new CanvasHack_Exception(
-                    "Manifest file missing, expected <code>$path/manifest.xml</code>",
-                    CanvasHack_Exception::MANIFEST
-                );
-            } else {
-                $this->loadManifestEntry($path);
-            }
-        }
-    }
-
-    public static function getCanvasHackById($sql, $id)
-    {
-        if (!($sql instanceof \mysqli)) {
-            throw new CanvasHack_Exception(
-                'Expected mysqli object, received ' . get_class($sql),
-                CanvasHack_Exception::MYSQL
-            );
-        }
-
-        $_id = $sql->real_escape_string($id);
-        $result = $sql->query("SELECT * FROM `canvashacks` WHERE `id` = '$_id'");
-        if ($result->num_rows === 0) {
-            throw new CanvasHack_Exception(
-                "No existing CanvasHacks matching ID `$id`",
-                CanvasHack_Exception::ID
-            );
-        } else {
-            $row = $result->fetch_assoc();
-            return new CanvasHack($sql, $row['path']);
-        }
-    }
-
-    private function loadManifestEntry($id)
-    {
-        $response = $this->sql->query("
+	private $sql;
+
+	private $path;
+
+	private $table = 'canvashacks';
+	private $css = 'css';
+	private $javascript = 'javascript';
+	private $pages = 'pages';
+	private $dom = 'dom';
+
+	private $id = null;
+	private $name = null;
+	private $abstract = null;
+	private $description = null;
+
+	public function __construct($sql, $path)
+	{
+
+		if ($sql instanceof \mysqli) {
+			$this->sql = $sql;
+		} else {
+			throw new CanvasHack_Exception(
+				'Expected mysqli object, received ' . get_class($sql),
+				CanvasHack_Exception::MYSQL
+			);
+		}
+
+		if (file_exists($path) && file_exists($manifest = realpath("$path/manifest.xml"))) {
+			$this->path = dirname($manifest);
+			$this->parseManifest($manifest);
+			$pluginMetadata = new \Battis\AppMetadata($this->sql, $this->id);
+			$pluginMetadata['PLUGIN_PATH'] = $path;
+			$pluginMetadata['PLUGIN_URL'] = (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != 'on' ? 'http://' : 'https://') . $_SERVER['SERVER_NAME'] . preg_replace("|^{$_SERVER['DOCUMENT_ROOT']}(.*)$|", '$1', $pluginMetadata['PLUGIN_PATH']);
+		} else {
+			if (isset($manifest)) {
+				throw new CanvasHack_Exception(
+					"Manifest file missing, expected <code>$path/manifest.xml</code>",
+					CanvasHack_Exception::MANIFEST
+				);
+			} else {
+				$this->loadManifestEntry($path);
+			}
+		}
+	}
+
+	public static function getCanvasHackById($sql, $id)
+	{
+		if (!($sql instanceof \mysqli)) {
+			throw new CanvasHack_Exception(
+				'Expected mysqli object, received ' . get_class($sql),
+				CanvasHack_Exception::MYSQL
+			);
+		}
+
+		$_id = $sql->real_escape_string($id);
+		$result = $sql->query("SELECT * FROM `canvashacks` WHERE `id` = '$_id'");
+		if ($result->num_rows === 0) {
+			throw new CanvasHack_Exception(
+				"No existing CanvasHacks matching ID `$id`",
+				CanvasHack_Exception::ID
+			);
+		} else {
+			$row = $result->fetch_assoc();
+			return new CanvasHack($sql, $row['path']);
+		}
+	}
+
+	private function loadManifestEntry($id)
+	{
+		$response = $this->sql->query("
             SELECT * FROM `{$this->table}` WHERE `id` = '" . $this->sql->real_escape_string($id) . "'
         ");
-        $row = $response->fetch_assoc();
-        if ($row) {
-            $this->id = $row['id'];
-            $this->name = $row['name'];
-            if (!empty($row['abstract'])) {
-                $this->abstract = $row['abstract'];
-            }
-            if (!empty($row['description'])) {
-                $this->description = $row['description'];
-            }
-        } else {
-            throw new CanvasHack_Exception(
-                "Manifest database entry missing for $id",
-                CanvasHack_Exception::MANIFEST
-            );
-        }
-    }
-
-    private function parseManifest($manifest)
-    {
-        $xml = simplexml_load_string(file_get_contents($manifest));
-        if ($xml === false) {
-            throw new CanvasHack_Exception(
-                "$manifest could not be parsed as a valid XML document",
-                CanvasHack_Exception::MANIFEST
-            );
-        }
-
-        $this->parseManifestMetadata($xml);
-        $this->parseManifestComponents($xml->components);
-    }
-
-    private function parseManifestMetadata($xml)
-    {
-        $this->required('id', $this->sql->real_escape_string($xml->id));
-        $this->required('name', $xml->name);
-        $this->optional('abstract', $xml->abstract);
-        $this->optional('description', $xml->description);
-        if (!isset($this->abstract) && !isset($this->description)) {
-            throw new CanvasHack_Exception(
-                'Either an abstract or a description must be provided in the manifest',
-                CanvasHack_Exception::REQUIRED
-            );
-        }
-
-        // TODO deal with authors
-
-        $_name = $this->sql->real_escape_string($this->name);
-        $_abstract = (
-            isset($this->abstract) ?
-                $this->sql->real_escape_string($this->abstract) :
-                $this->sql->real_escape_string($this->description)
-        );
-        $_description = (
-            isset($this->description) ?
-                $this->sql->real_escape_string($this->description) :
-                $this->sql->real_escape_string($this->abstract)
-        );
-        $_path = $this->sql->real_escape_string($this->path);
-
-        $this->updateDb($this->table, $this->id, array('name' => $_name, 'path' => $_path, 'abstract' => $_abstract, 'description' => $_description), 'id');
-    }
-
-    private function parseManifestCSS($css)
-    {
-        if (!empty($css)) {
-            $this->updateDb($this->css, $this->id, array('path' => realpath($this->path . '/' . $css)));
-        } else {
-            $this->clearDb($this->css, $this->id);
-        }
-    }
-
-    private function parseManifestJavascript($javascript)
-    {
-        if (!empty($javascript)) {
-            $this->updateDb($this->javascript, $this->id, array('path' => realpath($this->path) . '/' . $javascript));
-        } else {
-            $this->clearDb($this->javascript, $this->id);
-        }
-    }
-
-    private function parseManifestCanvasPages($pages)
-    {
-        $this->clearDb($this->pages, $this->id);
-        if (!empty($pages->include)) {
-            foreach ($pages->include->children() as $page) {
-                if (!$this->sql->query("
+		$row = $response->fetch_assoc();
+		if ($row) {
+			$this->id = $row['id'];
+			$this->name = $row['name'];
+			if (!empty($row['abstract'])) {
+				$this->abstract = $row['abstract'];
+			}
+			if (!empty($row['description'])) {
+				$this->description = $row['description'];
+			}
+		} else {
+			throw new CanvasHack_Exception(
+				"Manifest database entry missing for $id",
+				CanvasHack_Exception::MANIFEST
+			);
+		}
+	}
+
+	private function parseManifest($manifest)
+	{
+		$xml = simplexml_load_string(file_get_contents($manifest));
+		if ($xml === false) {
+			throw new CanvasHack_Exception(
+				"$manifest could not be parsed as a valid XML document",
+				CanvasHack_Exception::MANIFEST
+			);
+		}
+
+		$this->parseManifestMetadata($xml);
+		$this->parseManifestComponents($xml->components);
+	}
+
+	private function parseManifestMetadata($xml)
+	{
+		$this->required('id', $this->sql->real_escape_string($xml->id));
+		$this->required('name', $xml->name);
+		$this->optional('abstract', $xml->abstract);
+		$this->optional('description', $xml->description);
+		if (!isset($this->abstract) && !isset($this->description)) {
+			throw new CanvasHack_Exception(
+				'Either an abstract or a description must be provided in the manifest',
+				CanvasHack_Exception::REQUIRED
+			);
+		}
+
+		// TODO deal with authors
+
+		$_name = $this->sql->real_escape_string($this->name);
+		$_abstract = (
+			isset($this->abstract) ?
+				$this->sql->real_escape_string($this->abstract) :
+				$this->sql->real_escape_string($this->description)
+		);
+		$_description = (
+			isset($this->description) ?
+				$this->sql->real_escape_string($this->description) :
+				$this->sql->real_escape_string($this->abstract)
+		);
+		$_path = $this->sql->real_escape_string($this->path);
+
+		$this->updateDb($this->table, $this->id, array('name' => $_name, 'path' => $_path, 'abstract' => $_abstract, 'description' => $_description), 'id');
+	}
+
+	private function parseManifestCSS($css)
+	{
+		if (!empty($css)) {
+			$this->updateDb($this->css, $this->id, array('path' => realpath($this->path . '/' . $css)));
+		} else {
+			$this->clearDb($this->css, $this->id);
+		}
+	}
+
+	private function parseManifestJavascript($javascript)
+	{
+		if (!empty($javascript)) {
+			$this->updateDb($this->javascript, $this->id, array('path' => realpath($this->path) . '/' . $javascript));
+		} else {
+			$this->clearDb($this->javascript, $this->id);
+		}
+	}
+
+	private function parseManifestCanvasPages($pages)
+	{
+		$this->clearDb($this->pages, $this->id);
+		if (!empty($pages->include)) {
+			foreach ($pages->include->children() as $page) {
+				if (!$this->sql->query("
                     INSERT INTO `{$this->pages}`
                     (
                         `canvashack`,
@@ -184,16 +184,16 @@ 
                         TRUE
                     )
                 ")) {
-                    throw new CanvasHack_Exception(
-                        "Could not insert included page entry for {$this->id}: " . $page->asXml() . PHP_EOL . $this->sql->error,
-                        CanvasHack_Exception::SQL
-                    );
-                }
-            }
-        }
-        if (!empty($pages->exclude)) {
-            foreach ($pages->exclude->children() as $page) {
-                if (!$this->sql->query("
+					throw new CanvasHack_Exception(
+						"Could not insert included page entry for {$this->id}: " . $page->asXml() . PHP_EOL . $this->sql->error,
+						CanvasHack_Exception::SQL
+					);
+				}
+			}
+		}
+		if (!empty($pages->exclude)) {
+			foreach ($pages->exclude->children() as $page) {
+				if (!$this->sql->query("
                     INSERT INTO `{$this->pages}`
                     (
                         `canvashack`,
@@ -207,22 +207,22 @@ 
                         FALSE
                     )
                 ")) {
-                    // TODO wording could be improved
-                    throw new CanvasHack_Exception(
-                        "Could not insert included page entry for {$this->id}: " . $page->asXml() . PHP_EOL . $this->sql->error,
-                        CanvasHack_Exception::SQL
-                    );
-                }
-            }
-        }
-    }
-
-    private function parseManifestCanvasDOM($dom)
-    {
-        $this->clearDb($this->dom, $this->id);
-        if (!empty($dom)) {
-            foreach ($dom->children() as $bundle) {
-                if (!$this->sql->query("
+					// TODO wording could be improved
+					throw new CanvasHack_Exception(
+						"Could not insert included page entry for {$this->id}: " . $page->asXml() . PHP_EOL . $this->sql->error,
+						CanvasHack_Exception::SQL
+					);
+				}
+			}
+		}
+	}
+
+	private function parseManifestCanvasDOM($dom)
+	{
+		$this->clearDb($this->dom, $this->id);
+		if (!empty($dom)) {
+			foreach ($dom->children() as $bundle) {
+				if (!$this->sql->query("
                     INSERT INTO `{$this->dom}`
                     (
                         `canvashack`,
@@ -236,111 +236,111 @@ 
                         '" . $this->sql->real_escape_string($bundle->action) . "'
                     )
                 ")) {
-                    // TODO wording could be improved
-                    throw new CanvasHack_Exception(
-                        "Could not insert DOM entry for {$this->id}: " . $dom->asXml() . PHP_EOL . $this->sql->error,
-                        CanvasHack_Exception::SQL
-                    );
-                }
-            }
-        }
-    }
-
-    private function parseManifestCanvas($canvas)
-    {
-        $this->parseManifestCanvasPages($canvas->pages);
-        $this->parseManifestCanvasDOM($canvas->dom);
-    }
-
-    private function parseManifestComponents($components)
-    {
-        $this->parseManifestCSS($components->css);
-        $this->parseManifestJavascript($components->javascript);
-        $this->parseManifestCanvas($components->canvas);
-    }
-
-    private function required($field, $value)
-    {
-        if (!empty($value)) {
-            $this->$field = (string) $value;
-        } else {
-            throw new CanvasHack_Exception(
-                "`$field` is required and was not found in the manifest",
-                CanvasHack_Exception::REQUIRED
-            );
-        }
-    }
-
-    private function optional($field, $value)
-    {
-        if (isset($value)) {
-            $this->$field = (string) $value;
-        } else {
-            $this->$field = null;
-        }
-    }
-
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    public function getAbstract()
-    {
-        if (empty($this->abstract)) {
-            return $this->description;
-        } else {
-            return $this->abstract;
-        }
-    }
-
-    public function getDescription()
-    {
-        if (empty($this->description)) {
-            return $this->abstract;
-        } else {
-            return $this->description;
-        }
-    }
-
-    public function isEnabled()
-    {
-        $result = $this->sql->query("
+					// TODO wording could be improved
+					throw new CanvasHack_Exception(
+						"Could not insert DOM entry for {$this->id}: " . $dom->asXml() . PHP_EOL . $this->sql->error,
+						CanvasHack_Exception::SQL
+					);
+				}
+			}
+		}
+	}
+
+	private function parseManifestCanvas($canvas)
+	{
+		$this->parseManifestCanvasPages($canvas->pages);
+		$this->parseManifestCanvasDOM($canvas->dom);
+	}
+
+	private function parseManifestComponents($components)
+	{
+		$this->parseManifestCSS($components->css);
+		$this->parseManifestJavascript($components->javascript);
+		$this->parseManifestCanvas($components->canvas);
+	}
+
+	private function required($field, $value)
+	{
+		if (!empty($value)) {
+			$this->$field = (string) $value;
+		} else {
+			throw new CanvasHack_Exception(
+				"`$field` is required and was not found in the manifest",
+				CanvasHack_Exception::REQUIRED
+			);
+		}
+	}
+
+	private function optional($field, $value)
+	{
+		if (isset($value)) {
+			$this->$field = (string) $value;
+		} else {
+			$this->$field = null;
+		}
+	}
+
+	public function getId()
+	{
+		return $this->id;
+	}
+
+	public function getName()
+	{
+		return $this->name;
+	}
+
+	public function getAbstract()
+	{
+		if (empty($this->abstract)) {
+			return $this->description;
+		} else {
+			return $this->abstract;
+		}
+	}
+
+	public function getDescription()
+	{
+		if (empty($this->description)) {
+			return $this->abstract;
+		} else {
+			return $this->description;
+		}
+	}
+
+	public function isEnabled()
+	{
+		$result = $this->sql->query("
             SELECT * FROM `{$this->table}` WHERE `id` = '{$this->id}'
         ");
-        $row = $result->fetch_assoc();
-        return (isset($row['enabled']) && $row['enabled']);
-    }
+		$row = $result->fetch_assoc();
+		return (isset($row['enabled']) && $row['enabled']);
+	}
 
-    public function enable()
-    {
-        $this->sql->query("
+	public function enable()
+	{
+		$this->sql->query("
             UPDATE `{$this->table}` SET `enabled` = '1' WHERE `id` = '{$this->id}'
         ");
-    }
+	}
 
-    public function disable()
-    {
-        $this->sql->query("
+	public function disable()
+	{
+		$this->sql->query("
             UPDATE `{$this->table}` SET `enabled` = '0' WHERE `id` = '{$this->id}'
         ");
-    }
-
-    /**
-     * Helper function to insert/update into a SQL table
-     *
-     * @param string $table
-     * @param string $id CanvasHack identifier
-     * @param array $fields
-     **/
-    private function updateDb($table, $id, $fields, $idKey = 'canvashack')
-    {
-        $response = $this->sql->query("
+	}
+
+	/**
+	 * Helper function to insert/update into a SQL table
+	 *
+	 * @param string $table
+	 * @param string $id CanvasHack identifier
+	 * @param array $fields
+	 **/
+	private function updateDb($table, $id, $fields, $idKey = 'canvashack')
+	{
+		$response = $this->sql->query("
             SELECT *
                 FROM `$table`
                 WHERE
@@ -348,51 +348,51 @@ 
                 LIMIT 1
         ");
 
-        $params = array();
-        foreach ($fields as $field => $value) {
-            $params[] = "`$field` = '$value'";
-        }
+		$params = array();
+		foreach ($fields as $field => $value) {
+			$params[] = "`$field` = '$value'";
+		}
 
-        if ($response->num_rows > 0) {
-            if (!$this->sql->query("
+		if ($response->num_rows > 0) {
+			if (!$this->sql->query("
                 UPDATE `$table`
                     SET " .
-                    implode(', ', $params) .
-                "WHERE
+					implode(', ', $params) .
+				"WHERE
                     `$idKey` = '$id'
             ")) {
-                throw new CanvasHack_Exception(
-                    "Could not update `$table` with `$idKey` = '$id' and fields `$params'. " . $this->sql->error,
-                    CanvasHack_Exception::SQL
-                );
-            }
-        } else {
-            $fields[$idKey] = $this->id;
-            if (!$this->sql->query("
+				throw new CanvasHack_Exception(
+					"Could not update `$table` with `$idKey` = '$id' and fields `$params'. " . $this->sql->error,
+					CanvasHack_Exception::SQL
+				);
+			}
+		} else {
+			$fields[$idKey] = $this->id;
+			if (!$this->sql->query("
                 INSERT INTO `$table`
                 (`" . implode('`, `', array_keys($fields)) . "`)
                 VALUES
                 ('" . implode("', '", $fields) . "')
             ")) {
-                throw new CanvasHack_Exception(
-                    "Could not insert a new row into `$table` with `$idkey` = '$id' and fields `$params'. " . $this->sql->error,
-                    CanvasHack_Exception::SQL
-                );
-            }
-        }
-    }
-
-    private function clearDb($table, $id, $idKey = 'canvashack')
-    {
-        if (!$this->sql->query("
+				throw new CanvasHack_Exception(
+					"Could not insert a new row into `$table` with `$idkey` = '$id' and fields `$params'. " . $this->sql->error,
+					CanvasHack_Exception::SQL
+				);
+			}
+		}
+	}
+
+	private function clearDb($table, $id, $idKey = 'canvashack')
+	{
+		if (!$this->sql->query("
             DELETE FROM `$table`
                 WHERE
                     `$idKey` = '$id'
         ")) {
-            throw new CanvasHack_Exception(
-                "Could not clear `$table` of `$idKey` = '$id' entries. " . $this->sql->error,
-                CanvasHack_Exception::SQL
-            );
-        }
-    }
+			throw new CanvasHack_Exception(
+				"Could not clear `$table` of `$idKey` = '$id' entries. " . $this->sql->error,
+				CanvasHack_Exception::SQL
+			);
+		}
+	}
 }

Spacing +2 added lines, -4 removed lines

@@ -134,13 +134,11 @@
         $_name = $this->sql->real_escape_string($this->name);
         $_abstract = (
             isset($this->abstract) ?
-                $this->sql->real_escape_string($this->abstract) :
-                $this->sql->real_escape_string($this->description)
+                $this->sql->real_escape_string($this->abstract) : $this->sql->real_escape_string($this->description)
         );
         $_description = (
             isset($this->description) ?
-                $this->sql->real_escape_string($this->description) :
-                $this->sql->real_escape_string($this->abstract)
+                $this->sql->real_escape_string($this->description) : $this->sql->real_escape_string($this->abstract)
         );
         $_path = $this->sql->real_escape_string($this->path);
 

src/CanvasHack_Exception.php

Indentation +4 added lines, -4 removed lines

@@ -9,8 +9,8 @@
  **/
 class CanvasHack_Exception extends \Exception
 {
-    const MANIFEST = 1;
-    const SQL = 2;
-    const REQUIRED = 3;
-    const ID = 4;
+	const MANIFEST = 1;
+	const SQL = 2;
+	const REQUIRED = 3;
+	const ID = 4;
 }

index.php

Indentation +36 added lines, -36 removed lines

@@ -13,62 +13,62 @@
 
 /* store any requested actions for future handling */
 $action = (empty($_REQUEST['action']) ?
-    ACTION_UNSPECIFIED :
-    strtolower($_REQUEST['action'])
+	ACTION_UNSPECIFIED :
+	strtolower($_REQUEST['action'])
 );
 
 /* action requests only come from outside the LTI! */
 if ($action) {
-    unset($_SESSION[ToolProvider::class]);
+	unset($_SESSION[ToolProvider::class]);
 }
 
 /* authenticate LTI launch request, if present */
 if ($toolbox->lti_isLaunching()) {
-    $toolbox->resetSession();
-    $toolbox->lti_authenticate();
-    exit;
+	$toolbox->resetSession();
+	$toolbox->lti_authenticate();
+	exit;
 }
 
 /* if authenticated LTI launch, head off to app.php */
 if (!empty($_SESSION[ToolProvider::class]['canvas'])) {
-    header("Location: control-panel.php");
-    exit;
+	header("Location: control-panel.php");
+	exit;
 
 /* if not authenticated, default to showing credentials */
 } else {
-    $action = (empty($action) ?
-        ACTION_CONFIG :
-        $action
-    );
+	$action = (empty($action) ?
+		ACTION_CONFIG :
+		$action
+	);
 }
 
 /* process any actions */
 switch ($action) {
-    /* reset cached install data from config file */
-    case ACTION_INSTALL:
-        $_SESSION['toolbox'] = Toolbox::fromConfiguration(CONFIG_FILE, true);
-        $toolbox =& $_SESSION['toolbox'];
+	/* reset cached install data from config file */
+	case ACTION_INSTALL:
+		$_SESSION['toolbox'] = Toolbox::fromConfiguration(CONFIG_FILE, true);
+		$toolbox =& $_SESSION['toolbox'];
 
-        /* test to see if we can connect to the API */
-        try {
-            $toolbox->getAPI();
-        } catch (ConfigurationException $e) {
-            /* if there isn't an API token in config.xml, are there OAuth credentials? */
-            if ($e->getCode() === ConfigurationException::CANVAS_API_INCORRECT) {
-                $toolbox->interactiveGetAccessToken();
-                exit;
-            } else { /* no (understandable) API credentials available -- doh! */
-                throw $e;
-            }
-        }
+		/* test to see if we can connect to the API */
+		try {
+			$toolbox->getAPI();
+		} catch (ConfigurationException $e) {
+			/* if there isn't an API token in config.xml, are there OAuth credentials? */
+			if ($e->getCode() === ConfigurationException::CANVAS_API_INCORRECT) {
+				$toolbox->interactiveGetAccessToken();
+				exit;
+			} else { /* no (understandable) API credentials available -- doh! */
+				throw $e;
+			}
+		}
 
-        /* finish by opening consumers control panel */
-        header('Location: consumers.php');
-        exit;
+		/* finish by opening consumers control panel */
+		header('Location: consumers.php');
+		exit;
 
-    /* show LTI configuration XML file */
-    case ACTION_CONFIG:
-        header('Content-type: application/xml');
-        echo $toolbox->saveConfigurationXML();
-        exit;
+	/* show LTI configuration XML file */
+	case ACTION_CONFIG:
+		header('Content-type: application/xml');
+		echo $toolbox->saveConfigurationXML();
+		exit;
 }

Spacing +3 added lines, -5 removed lines

@@ -13,8 +13,7 @@ 
 
 /* store any requested actions for future handling */
 $action = (empty($_REQUEST['action']) ?
-    ACTION_UNSPECIFIED :
-    strtolower($_REQUEST['action'])
+    ACTION_UNSPECIFIED : strtolower($_REQUEST['action'])
 );
 
 /* action requests only come from outside the LTI! */
@@ -37,8 +36,7 @@ 
 /* if not authenticated, default to showing credentials */
 } else {
     $action = (empty($action) ?
-        ACTION_CONFIG :
-        $action
+        ACTION_CONFIG : $action
     );
 }
 
@@ -47,7 +45,7 @@ 
     /* reset cached install data from config file */
     case ACTION_INSTALL:
         $_SESSION['toolbox'] = Toolbox::fromConfiguration(CONFIG_FILE, true);
-        $toolbox =& $_SESSION['toolbox'];
+        $toolbox = & $_SESSION['toolbox'];
 
         /* test to see if we can connect to the API */
         try {

src/Toolbox.php

Indentation +66 added lines, -66 removed lines

@@ -8,79 +8,79 @@
 
 class Toolbox extends \smtech\StMarksReflexiveCanvasLTI\Toolbox
 {
-    /**
-     * Custom Preferences database
-     * @var mysqli
-     */
-    protected $customPrefs;
+	/**
+	 * Custom Preferences database
+	 * @var mysqli
+	 */
+	protected $customPrefs;
 
-    /**
-     * Configure account navigation placement
-     *
-     * @return Generator
-     */
-    public function getGenerator()
-    {
-        parent::getGenerator();
+	/**
+	 * Configure account navigation placement
+	 *
+	 * @return Generator
+	 */
+	public function getGenerator()
+	{
+		parent::getGenerator();
 
-        $this->generator->setOptionProperty(
-            Option::ACCOUNT_NAVIGATION(),
-            'visibility',
-            'admins'
-        );
+		$this->generator->setOptionProperty(
+			Option::ACCOUNT_NAVIGATION(),
+			'visibility',
+			'admins'
+		);
 
-        return $this->generator;
-    }
+		return $this->generator;
+	}
 
-    /**
-     * Update a Toolbox instance from a configuration file
-     *
-     * @see Toolbox::fromConfiguration() Use `Toolbox::fromConfiguration()`
-     *
-     * @param  string $configFilePath
-     * @param  boolean $forceRecache
-     * @return void
-     */
-    protected function loadConfiguration($configFilePath, $forceRecache = false)
-    {
-        parent::loadConfiguration($configFilePath, $forceRecache);
+	/**
+	 * Update a Toolbox instance from a configuration file
+	 *
+	 * @see Toolbox::fromConfiguration() Use `Toolbox::fromConfiguration()`
+	 *
+	 * @param  string $configFilePath
+	 * @param  boolean $forceRecache
+	 * @return void
+	 */
+	protected function loadConfiguration($configFilePath, $forceRecache = false)
+	{
+		parent::loadConfiguration($configFilePath, $forceRecache);
 
-        $config = new ConfigXML($configFilePath);
+		$config = new ConfigXML($configFilePath);
 
-        /* configure database connections */
-        $this->setCustomPrefs($config->newInstanceOf(mysqli::class, '/config/customprefs'));
-    }
+		/* configure database connections */
+		$this->setCustomPrefs($config->newInstanceOf(mysqli::class, '/config/customprefs'));
+	}
 
-    /**
-     * Set MySQL connection object
-     *
-     * @param mysqli $mysql
-     */
-    public function setCustomPrefs(mysqli $mysql)
-    {
-        $this->customPrefs = $mysql;
-    }
+	/**
+	 * Set MySQL connection object
+	 *
+	 * @param mysqli $mysql
+	 */
+	public function setCustomPrefs(mysqli $mysql)
+	{
+		$this->customPrefs = $mysql;
+	}
 
-    /**
-     * Get MySQL connection object
-     *
-     * @return mysqli
-     */
-    public function getCustomPrefs()
-    {
-        return $this->customPrefs;
-    }
+	/**
+	 * Get MySQL connection object
+	 *
+	 * @return mysqli
+	 */
+	public function getCustomPrefs()
+	{
+		return $this->customPrefs;
+	}
 
-    /**
-     * Make a MySQL query
-     *
-     * @link http://php.net/manual/en/mysqli.query.php Pass-through to `mysqli::query()`
-     * @param string $query
-     * @param int $resultMode (Optional, defaults to `MYSQLI_STORE_RESULT`)
-     * @return mixed
-     */
-    public function customPrefs_query($query, $resultMode = MYSQLI_STORE_RESULT)
-    {
-        return $this->getCustomPrefs()->query($query, $resultMode);
-    }
+	/**
+	 * Make a MySQL query
+	 *
+	 * @link http://php.net/manual/en/mysqli.query.php Pass-through to `mysqli::query()`
+	 * @param string $query
+	 * @param int $resultMode (Optional, defaults to `MYSQLI_STORE_RESULT`)
+	 * @return mixed
+	 */
+	public function customPrefs_query($query, $resultMode = MYSQLI_STORE_RESULT)
+	{
+		return $this->getCustomPrefs()->query($query, $resultMode);
+	}
 }

canvashack.css.php

Indentation +20 added lines, -20 removed lines

@@ -17,16 +17,16 @@ 
 
 function canonicalNamespaceId($id)
 {
-    return preg_replace('/[^a-z0-9]+/i', '_', $id);
+	return preg_replace('/[^a-z0-9]+/i', '_', $id);
 }
 
 function canvasHackNamespace($id, $javascript)
 {
-    return preg_replace(
-        '/^(\s*var\s+)?canvashack\s*=\s*{\n*(.*)};/is',
-        canonicalNamespaceId($id) . ": {\n$2\n}",
-        $javascript
-    );
+	return preg_replace(
+		'/^(\s*var\s+)?canvashack\s*=\s*{\n*(.*)};/is',
+		canonicalNamespaceId($id) . ": {\n$2\n}",
+		$javascript
+	);
 }
 
 $canvashacks = array();
@@ -42,14 +42,14 @@ 
 ");
 
 while ($page = $enabledPages->fetch_assoc()) {
-    if ((!empty($page['url']) && $page['url'] == $location) ||
-        (!empty($page['pattern']) && preg_match($page['pattern'], $location))) {
-        if ($page['include']) {
-            $canvashacks[$page['canvashack']] = true;
-        } else {
-            unset($canvashacks[$page['canvashack']]);
-        }
-    }
+	if ((!empty($page['url']) && $page['url'] == $location) ||
+		(!empty($page['pattern']) && preg_match($page['pattern'], $location))) {
+		if ($page['include']) {
+			$canvashacks[$page['canvashack']] = true;
+		} else {
+			unset($canvashacks[$page['canvashack']]);
+		}
+	}
 }
 
 $css = array();
@@ -59,15 +59,15 @@ 
         WHERE
             `canvashack` = '" . implode("' OR `canvashack` = '", array_keys($canvashacks)) . "'
 ")) == false) {
-    exit;
+	exit;
 }
 while ($entry = $applicableCSS->fetch_assoc()) {
-    $css[$entry['canvashack']] = shell_exec("php \"{$entry['path']}\" \"{$location}\" 2>&1");
+	$css[$entry['canvashack']] = shell_exec("php \"{$entry['path']}\" \"{$location}\" 2>&1");
 }
 
 foreach ($css as $id => $stylesheet) {
-    $plugin = new AppMetadata($toolbox->getMySQL(), $id);
-    echo "/* CanvasHack ID $id begin */\n";
-    echo $plugin->derivedValues($stylesheet);
-    echo "\n/* CanvasHack ID $id end */\n\n";
+	$plugin = new AppMetadata($toolbox->getMySQL(), $id);
+	echo "/* CanvasHack ID $id begin */\n";
+	echo $plugin->derivedValues($stylesheet);
+	echo "\n/* CanvasHack ID $id end */\n\n";
 }

common.inc.php

Spacing +6 added lines, -6 removed lines

@@ -13,23 +13,23 @@
 
 /* prepare the toolbox */
 if (empty($_SESSION[Toolbox::class])) {
-    $_SESSION[Toolbox::class] =& Toolbox::fromConfiguration(CONFIG_FILE);
+    $_SESSION[Toolbox::class] = & Toolbox::fromConfiguration(CONFIG_FILE);
 }
-$toolbox =& $_SESSION[Toolbox::class];
+$toolbox = & $_SESSION[Toolbox::class];
 if (php_sapi_name() !== 'cli') {
     $toolbox->smarty_prependTemplateDir(__DIR__ . '/templates', basename(__DIR__));
     $toolbox->smarty_assign([
         'category' => DataUtilities::titleCase(preg_replace('/[\-_]+/', ' ', basename(__DIR__)))
     ]);
-     $smarty =& $toolbox->getSmarty(); // FIXME
+     $smarty = & $toolbox->getSmarty(); // FIXME
 }
 
 /*
  * FIXME convience variables until plugins are all updated
  */
-$api =& $toolbox->getAPI();
-$sql =& $toolbox->getMySQL();
-$customPrefs =& $toolbox->getCustomPrefs();
+$api = & $toolbox->getAPI();
+$sql = & $toolbox->getMySQL();
+$customPrefs = & $toolbox->getCustomPrefs();
 
 /* set the Tool Consumer's instance URL, if present */
 if (empty($_SESSION[CANVAS_INSTANCE_URL]) &&

Indentation +11 added lines, -11 removed lines

@@ -13,15 +13,15 @@ 
 
 /* prepare the toolbox */
 if (empty($_SESSION[Toolbox::class])) {
-    $_SESSION[Toolbox::class] =& Toolbox::fromConfiguration(CONFIG_FILE);
+	$_SESSION[Toolbox::class] =& Toolbox::fromConfiguration(CONFIG_FILE);
 }
 $toolbox =& $_SESSION[Toolbox::class];
 if (php_sapi_name() !== 'cli') {
-    $toolbox->smarty_prependTemplateDir(__DIR__ . '/templates', basename(__DIR__));
-    $toolbox->smarty_assign([
-        'category' => DataUtilities::titleCase(preg_replace('/[\-_]+/', ' ', basename(__DIR__)))
-    ]);
-     $smarty =& $toolbox->getSmarty(); // FIXME
+	$toolbox->smarty_prependTemplateDir(__DIR__ . '/templates', basename(__DIR__));
+	$toolbox->smarty_assign([
+		'category' => DataUtilities::titleCase(preg_replace('/[\-_]+/', ' ', basename(__DIR__)))
+	]);
+	 $smarty =& $toolbox->getSmarty(); // FIXME
 }
 
 /*
@@ -33,9 +33,9 @@ 
 
 /* set the Tool Consumer's instance URL, if present */
 if (empty($_SESSION[CANVAS_INSTANCE_URL])) {
-    if (!empty($_SESSION[ToolProvider::class]['canvas']['api_domain'])) {
-        $_SESSION[CANVAS_INSTANCE_URL] = 'https://' . $_SESSION[ToolProvider::class]['canvas']['api_domain'];
-    } else {
-        $_SESSION[CANVAS_INSTANCE_URL] = $toolbox->config('TOOL_CANVAS_API')['url'];
-    }
+	if (!empty($_SESSION[ToolProvider::class]['canvas']['api_domain'])) {
+		$_SESSION[CANVAS_INSTANCE_URL] = 'https://' . $_SESSION[ToolProvider::class]['canvas']['api_domain'];
+	} else {
+		$_SESSION[CANVAS_INSTANCE_URL] = $toolbox->config('TOOL_CANVAS_API')['url'];
+	}
 }