From 02349ab9705d3d38c57bd50f44ecc729e2172f51 Mon Sep 17 00:00:00 2001 From: Skylar Ittner Date: Fri, 23 Mar 2018 20:33:40 -0600 Subject: [PATCH] Flesh out database code --- .gitignore | 1 + other/database.mwb | Bin 0 -> 5201 bytes www/required.php | 31 +++++++++++++++++-------------- 3 files changed, 18 insertions(+), 14 deletions(-) create mode 100644 other/database.mwb diff --git a/.gitignore b/.gitignore index 397a30c..28d72fc 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ *settings.php +*.bak diff --git a/other/database.mwb b/other/database.mwb new file mode 100644 index 0000000000000000000000000000000000000000..895a718e57a9234f2c79133b3db18c74f7c6a276 GIT binary patch literal 5201 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 literal 0 HcmV?d00001 diff --git a/www/required.php b/www/required.php index 9b8e20c..e63309a 100644 --- a/www/required.php +++ b/www/required.php @@ -9,6 +9,16 @@ */ ob_start(); // allow sending headers after content +// Settings file +require __DIR__ . '/settings.php'; + +if (!DEBUG) { + error_reporting(0); +} else { + error_reporting(E_ALL); + ini_set('display_errors', 'On'); +} + // Set default content type to JSON header('Content-Type: application/json; charset=utf-8'); @@ -37,15 +47,10 @@ if (!file_exists(__DIR__ . '/vendor/autoload.php')) { } require __DIR__ . '/vendor/autoload.php'; -// Settings file -require __DIR__ . '/settings.php'; - function sendError($error) { die('{"status": "ERROR", "msg": "A fatal application error has occurred: ' . htmlspecialchars($error) . '"}'); } -date_default_timezone_set(TIMEZONE); - // Database settings // Also inits database and stuff use Medoo\Medoo; @@ -57,20 +62,18 @@ try { 'database_file' => DB_FILE, 'charset' => DB_CHARSET ]); + + $database_configured = $database->query("SELECT name FROM sqlite_master WHERE type='table' AND name='accounts';")->fetchAll(); + if (count($database_configured) == 0) { + $database->query("CREATE TABLE IF NOT EXISTS `accounts` " + . "(`uid` INT NOT NULL UNIQUE PRIMARY KEY, `username` VARCHAR(190) NOT NULL, " + . "`password` VARCHAR(255) NOT NULL, `authsecret` VARCHAR(100))"); + } } catch (Exception $ex) { header('HTTP/1.1 500 Internal Server Error'); sendError("Database error. $ex"); } - -if (!DEBUG) { - error_reporting(0); -} else { - error_reporting(E_ALL); - ini_set('display_errors', 'On'); -} - - $VARS; if ($_SERVER['REQUEST_METHOD'] === 'POST') { $VARS = $_POST;