diff --git a/admin/all.php b/admin/all.php index 3f97834..d002a9e 100644 --- a/admin/all.php +++ b/admin/all.php @@ -10,12 +10,17 @@ $rows = pg_fetch_all($qresp); $totalUnresponded = 0; $totalPriv = 0; +$totalPrivRead = 0; $totalRespondedPub = 0; foreach (array_reverse($rows) as $i) { if ($i["isrespondedto"] === "f" && $i["ispublic"] === "t") { $totalUnresponded++; } else if ($i["ispublic"] === "f") { - $totalPriv++; + if ($i["isprivread"] === "t") { + $totalPrivRead++; + } else { + $totalPriv++; + } } else { $totalRespondedPub++; } @@ -31,6 +36,18 @@ if ($_GET["responded"] == 1) { echo("response sent!"); } +if ($_GET["read"] == 1) { + echo("marked as read!"); +} + +if ($_GET["unread"] == 1) { + echo("marked as unread!"); +} + +if ($_GET["migrated"] == 1) { + echo("migrations have been run!"); +} + asort($rows); echo("

not responded to ({$totalUnresponded})

"); @@ -46,16 +63,16 @@ foreach (array_reverse($rows) as $i){ } } -echo("

private ({$totalPriv})

"); +echo("

unread private ({$totalPriv})

"); foreach (array_reverse($rows) as $i){ - if ($i["ispublic"] === "f") { + if ($i["ispublic"] === "f" && $i["isprivread"] === "f") { echo("
"); if ($i["iscwed"] === "t") { echo("
cw: " . htmlspecialchars($i["cw"]) . ""); } echo(htmlspecialchars($i["text"])); echo("
" . $i["time"] . "
"); - echo("delete
"); + echo("mark read / delete"); } } @@ -74,4 +91,17 @@ foreach (array_reverse($rows) as $i){ } } +echo("

read private ({$totalPrivRead})

"); +foreach (array_reverse($rows) as $i){ + if ($i["ispublic"] === "f" && $i["isprivread"] === "t") { + echo("
"); + if ($i["iscwed"] === "t") { + echo("
cw: " . htmlspecialchars($i["cw"]) . ""); + } + echo(htmlspecialchars($i["text"])); + echo("
" . $i["time"] . "
"); + echo("mark unread / delete
"); + } +} + ?> diff --git a/admin/delete.php b/admin/delete.php index b5be919..db20957 100644 --- a/admin/delete.php +++ b/admin/delete.php @@ -13,8 +13,6 @@ WHERE id = {$id}; pg_query($db, $query); -echo("done"); - header("Location: index.php?deleted=1&pw={$adminPassword}"); ?> \ No newline at end of file diff --git a/admin/index.php b/admin/index.php index 8f3aea2..2dfb424 100644 --- a/admin/index.php +++ b/admin/index.php @@ -9,6 +9,10 @@ if ($_GET["pw"] === $adminPassword) { include 'delete.php'; } elseif ($_GET["page"] === "respond") { include 'respond.php'; + } elseif ($_GET["page"] === "mark") { + include 'mark.php'; + } elseif ($_GET["page"] === "migrate") { + include 'migrate.php'; } else { include 'all.php'; } diff --git a/admin/mark.php b/admin/mark.php new file mode 100644 index 0000000..6e93e73 --- /dev/null +++ b/admin/mark.php @@ -0,0 +1,29 @@ + \ No newline at end of file diff --git a/admin/migrate.php b/admin/migrate.php new file mode 100644 index 0000000..9101d1b --- /dev/null +++ b/admin/migrate.php @@ -0,0 +1,25 @@ + \ No newline at end of file diff --git a/migrations/20240218-AddFalsesToPrivRead-67d82b18.php b/migrations/20240218-AddFalsesToPrivRead-67d82b18.php new file mode 100644 index 0000000..95c7d17 --- /dev/null +++ b/migrations/20240218-AddFalsesToPrivRead-67d82b18.php @@ -0,0 +1,19 @@ + "20240218-AddFalsesToPrivRead-67d82b18" +); + +pg_insert($db, "migrations", $dataArray); + +?> \ No newline at end of file diff --git a/migrations/20240218-AddMarkReadOption-a7e43358.php b/migrations/20240218-AddMarkReadOption-a7e43358.php new file mode 100644 index 0000000..038b168 --- /dev/null +++ b/migrations/20240218-AddMarkReadOption-a7e43358.php @@ -0,0 +1,18 @@ + "20240218-AddMarkReadOption-a7e43358" +); + +pg_insert($db, "migrations", $dataArray); + +?> \ No newline at end of file diff --git a/migrations/20240218-AddMigrationsTable-40641e8d.php b/migrations/20240218-AddMigrationsTable-40641e8d.php new file mode 100644 index 0000000..62a7a68 --- /dev/null +++ b/migrations/20240218-AddMigrationsTable-40641e8d.php @@ -0,0 +1,19 @@ + "20240218-AddMigrationsTable-40641e8d" +); + +pg_insert($db, "migrations", $dataArray); + +?> \ No newline at end of file diff --git a/setup.php b/setup.php index ea8258e..3791d77 100644 --- a/setup.php +++ b/setup.php @@ -12,12 +12,23 @@ CREATE TABLE data ( ispublic BOOLEAN NOT NULL, isrespondedto BOOLEAN NOT NULL, responsetext TEXT, - responsetime TIMESTAMPTZ + responsetime TIMESTAMPTZ, + isprivread BOOLEAN NOT NULL ); "; pg_query($db, $query); +$query = " +CREATE TABLE migrations ( + id TEXT NOT NULL +); +"; + +pg_query($db, $query); + +include 'admin/migrate.php'; + echo "database set up"; ?> \ No newline at end of file