From 036c8f04f2a154e01c749dba4f1a69c564e423f6 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sat, 12 Sep 2020 17:18:08 +0300 Subject: add some basic startup sanity checks --- common.php | 26 ++++++++++++++++++++++++++ index.php | 14 +++++--------- login.php | 4 ++++ 3 files changed, 35 insertions(+), 9 deletions(-) create mode 100644 common.php diff --git a/common.php b/common.php new file mode 100644 index 0000000..367ae55 --- /dev/null +++ b/common.php @@ -0,0 +1,26 @@ +query("SELECT id FROM epube_users LIMIT 1"); + + if (!$res) { + die("Test query failed, is schema installed? (sqlite3 " . SCRATCH_DB . "< schema.sql)"); + } + + } catch (Exception $e) { + die($e); + } + +} \ No newline at end of file diff --git a/index.php b/index.php index 02f1cea..34a3fa8 100644 --- a/index.php +++ b/index.php @@ -7,12 +7,16 @@ die("sessions/ directory is not writable."); } + require_once "config.php"; + require_once "common.php"; + + sanity_check(); + if (!isset($_COOKIE['epube_sid'])) { header("Location: login.php"); exit; } - require_once "config.php"; require_once "sessions.php"; require_once "db.php"; @@ -34,14 +38,6 @@ die; } - if (!is_writable(SCRATCH_DB)) { - die(SCRATCH_DB . " is not writable"); - } - - if (!is_writable(dirname(SCRATCH_DB))) { - die(dirname(SCRATCH_DB) . " directory is not writable"); - } - // TODO: this should be unified with the service worker cache list $check_files_mtime = [ 'manifest.json', diff --git a/login.php b/login.php index b80792b..0e06464 100644 --- a/login.php +++ b/login.php @@ -1,5 +1,9 @@