From 28d453b6141defc2a97c9a7845c7232065184bef Mon Sep 17 00:00:00 2001
From: notfire <notfire@posteo.net>
Date: Thu, 27 Feb 2025 09:02:58 -0500
Subject: [PATCH] add boilerplate to pages to make them a bit more valid, also
 preload values for response edits

---
 admin/all.php             | 16 ++++++++++++----
 admin/index.php           |  5 +++--
 admin/respond.php         |  8 ++++++--
 boilerplate/pageEnd.php   |  5 +++++
 boilerplate/pageStart.php |  5 +++++
 fetch.php                 |  5 ++++-
 index.php                 |  6 +++++-
 7 files changed, 40 insertions(+), 10 deletions(-)
 create mode 100644 boilerplate/pageEnd.php
 create mode 100644 boilerplate/pageStart.php

diff --git a/admin/all.php b/admin/all.php
index d002a9e..8ad8d2f 100644
--- a/admin/all.php
+++ b/admin/all.php
@@ -26,6 +26,12 @@ foreach (array_reverse($rows) as $i) {
     }
 }
 
+$properTitle = $pageTitle . " – admin";
+
+include '../boilerplate/pageStart.php';
+
+echo("<link rel=\"stylesheet\" href=\"../css/admin.css\">");
+
 echo("<h2 class=\"title\">" . $pageTitle . " – admin</h2>");
 
 if ($_GET["deleted"] == 1) {
@@ -59,7 +65,7 @@ foreach (array_reverse($rows) as $i){
         }
         echo(htmlspecialchars($i["text"]));
         echo("<div class=\"time\">" . $i["time"] . "</div>");
-        echo("<a class=\"permalink\" href=\"index.php?page=respond&id=" . $i["id"] . "&pw={$adminPassword}\">respond</a> / <a class=\"permalink\" href=\"index.php?page=delete&id=" . $i["id"] . "&pw={$adminPassword}\">delete</a></div>");
+        echo("<a class=\"permalink\" href=\"index.php?page=respond&id=" . $i["id"] . "&pw={$adminPassword}\">respond</a> / <a class=\"permalink\" href=\"index.php?page=delete&id=" . $i["id"] . "&pw={$adminPassword}\">delete</a></details></div>");
     }
 }
 
@@ -72,7 +78,7 @@ foreach (array_reverse($rows) as $i){
         }
         echo(htmlspecialchars($i["text"]));
         echo("<div class=\"time\">" . $i["time"] . "</div>");
-        echo("<a class=\"permalink\" href=\"index.php?page=mark&action=read&id=" . $i["id"] . "&pw={$adminPassword}\">mark read</a> / <a class=\"permalink\" href=\"index.php?page=delete&id=" . $i["id"] . "&pw={$adminPassword}\">delete</a></div>");
+        echo("<a class=\"permalink\" href=\"index.php?page=mark&action=read&id=" . $i["id"] . "&pw={$adminPassword}\">mark read</a> / <a class=\"permalink\" href=\"index.php?page=delete&id=" . $i["id"] . "&pw={$adminPassword}\">delete</a></details></div>");
     }
 }
 
@@ -87,7 +93,7 @@ foreach (array_reverse($rows) as $i){
         echo("<div class=\"time\">" . $i["time"] . "</div>");
         echo("<div class=\"response\">" . htmlspecialchars($i["responsetext"]) . "");
         echo("<div class=\"time\">" . $i["responsetime"] . "</div></div>");
-        echo("<a class=\"permalink\" href=\"index.php?page=respond&responded=1&id=" . $i["id"] . "&pw={$adminPassword}\">edit response</a> / <a class=\"permalink\" href=\"index.php?page=delete&id=" . $i["id"] . "&pw={$adminPassword}\">delete</a></div>");
+        echo("<a class=\"permalink\" href=\"index.php?page=respond&responded=1&id=" . $i["id"] . "&pw={$adminPassword}\">edit response</a> / <a class=\"permalink\" href=\"index.php?page=delete&id=" . $i["id"] . "&pw={$adminPassword}\">delete</a></details></div>");
     }
 }
 
@@ -100,8 +106,10 @@ foreach (array_reverse($rows) as $i){
         }
         echo(htmlspecialchars($i["text"]));
         echo("<div class=\"time\">" . $i["time"] . "</div>");
-        echo("<a class=\"permalink\" href=\"index.php?page=mark&action=unread&id=" . $i["id"] . "&pw={$adminPassword}\">mark unread</a> / <a class=\"permalink\" href=\"index.php?page=delete&id=" . $i["id"] . "&pw={$adminPassword}\">delete</a></div>");
+        echo("<a class=\"permalink\" href=\"index.php?page=mark&action=unread&id=" . $i["id"] . "&pw={$adminPassword}\">mark unread</a> / <a class=\"permalink\" href=\"index.php?page=delete&id=" . $i["id"] . "&pw={$adminPassword}\">delete</a></details></div>");
     }
 }
 
+include '../boilerplate/pageEnd.php';
+
 ?>
diff --git a/admin/index.php b/admin/index.php
index 2dfb424..12d9a7e 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -2,8 +2,6 @@
 
 include '../config.php';
 
-echo("<link rel=\"stylesheet\" href=\"../css/admin.css\">");
-
 if ($_GET["pw"] === $adminPassword) {
     if ($_GET["page"] === "delete") {
         include 'delete.php';
@@ -17,6 +15,9 @@ if ($_GET["pw"] === $adminPassword) {
         include 'all.php';
     }
 } else {
+    $properTitle = $pageTitle . " – sign in";
+    include 'boilerplate/pageStart.php';
+
     echo("<h2 class=\"sect\">enter password</h2>");
     echo("<form class=\"frm\" action=\"index.php\"><input id=\"passinput\" name=\"pw\" required=\"\"><br><button class=\"submitbutton\" type=\"submit\">login</button></form>");
 }
diff --git a/admin/respond.php b/admin/respond.php
index 1c2a7e0..7c208ed 100644
--- a/admin/respond.php
+++ b/admin/respond.php
@@ -34,7 +34,10 @@ WHERE id = {$id};
 $qresp = pg_query($db, $query);
 $arr = pg_fetch_array($qresp);
 
-echo("<link rel=\"stylesheet\" href=\"css/indiv.css\">");
+$properTitle = $pageTitle . " – respond to question #" . $id;
+include '../boilerplate/pageStart.php';
+
+echo("<link rel=\"stylesheet\" href=\"../css/admin.css\">");
 
 if ($arr["ispublic"] === "f") {
     echo("<h2 class=\"title\">{$pageTitle} – no such question exists</h2>");
@@ -57,7 +60,8 @@ if ($arr["ispublic"] === "f") {
     } else {
         echo("<h3>enter a response</h3>");
     }
-    echo("<form class=\"frm\" action=\"index.php\"><input hidden name=\"id\" value=\"{$id}\"><input hidden name=\"page\" value=\"respond\"><input hidden name=\"pw\" value=\"{$adminPassword}\"><input id=\"passinput\" name=\"text\" required=\"\"><br><button class=\"submitbutton\" type=\"submit\">send</button></form>");
+    $respTxt = htmlspecialchars($arr["responsetext"]);
+    echo("<form class=\"frm\" action=\"index.php\"><input hidden name=\"id\" value=\"{$id}\"><input hidden name=\"page\" value=\"respond\"><input hidden name=\"pw\" value=\"{$adminPassword}\"><input id=\"passinput\" name=\"text\" value=\"{$respTxt}\" autofocus=\"autofocus\" required=\"\"><br><button class=\"submitbutton\" type=\"submit\">send</button></form>");
 }
 
 ?>
diff --git a/boilerplate/pageEnd.php b/boilerplate/pageEnd.php
new file mode 100644
index 0000000..087b532
--- /dev/null
+++ b/boilerplate/pageEnd.php
@@ -0,0 +1,5 @@
+<?php
+// set up the page to have proper tags like <title>
+echo("</body></html>")
+
+?>
\ No newline at end of file
diff --git a/boilerplate/pageStart.php b/boilerplate/pageStart.php
new file mode 100644
index 0000000..b8139e2
--- /dev/null
+++ b/boilerplate/pageStart.php
@@ -0,0 +1,5 @@
+<?php
+// set up the page to have proper tags like <title>
+echo("<!DOCTYPE html><html><head><title>" . $properTitle . "</title><meta name=\"viewport\" content=\"width=device-width, initial-scale=1\"/></head><body>")
+
+?>
\ No newline at end of file
diff --git a/fetch.php b/fetch.php
index 505d24e..e6a9532 100644
--- a/fetch.php
+++ b/fetch.php
@@ -16,6 +16,9 @@ WHERE id = {$id};
 $qresp = pg_query($db, $query);
 $arr = pg_fetch_array($qresp);
 
+$properTitle = $pageTitle . " – question #" . $id;
+include 'boilerplate/pageStart.php';
+
 echo("<link rel=\"stylesheet\" href=\"css/indiv.css\">");
 
 if (pg_num_rows($qresp) === 0 || $arr["ispublic"] === "f" || $arr["isrespondedto"] === "f") {
@@ -33,7 +36,7 @@ if (pg_num_rows($qresp) === 0 || $arr["ispublic"] === "f" || $arr["isrespondedto
     echo(htmlspecialchars($arr["text"]));
     echo("<div class=\"time\">" . $arr["time"] . "</div>");
     echo("<div class=\"response\">" . $arr["responsetext"] . "");
-    echo("<div class=\"time\">" . $arr["responsetime"] . "</div></div></div>");
+    echo("<div class=\"time\">" . $arr["responsetime"] . "</div></div></details></div>");
 }
 
 ?>
diff --git a/index.php b/index.php
index 999474d..4045891 100644
--- a/index.php
+++ b/index.php
@@ -10,6 +10,10 @@ $qresp = pg_query($db, $query);
 
 $rows = pg_fetch_all($qresp);
 
+$properTitle = $pageTitle . " – all questions";
+
+include 'boilerplate/pageStart.php';
+
 echo("<link rel=\"stylesheet\" href=\"css/main.css\">");
 
 echo("<h2 class=\"title\">" . $pageTitle . "</h2>");
@@ -42,7 +46,7 @@ foreach (array_reverse($rows) as $i){
         echo("<div class=\"time\">" . $i["time"] . "</div>");
         echo("<div class=\"response\">" . htmlspecialchars($i["responsetext"]) . "");
         echo("<div class=\"time\">" . $i["responsetime"] . "</div></div>");
-        echo("<a class=\"permalink\" href=\"fetch.php?id=" . $i["id"] . "\">permalink</a></div>");
+        echo("<a class=\"permalink\" href=\"fetch.php?id=" . $i["id"] . "\">permalink</a></details></div>");
     }
 }