From 91df09f81b4b10725100abf76430cb8ace937fdf Mon Sep 17 00:00:00 2001
From: trinkey <trinkey@duck.com>
Date: Thu, 27 Mar 2025 10:29:33 -0400
Subject: [PATCH] fix deletion and add sorting bypass

---
 css/base.css    |  6 +++++-
 helper.php      |  8 ++++++++
 index.php       | 24 +++++++++++++++++-------
 lang/en-US.json |  1 +
 setup.php       |  6 +++---
 5 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/css/base.css b/css/base.css
index 9c900e0..056b021 100644
--- a/css/base.css
+++ b/css/base.css
@@ -79,7 +79,7 @@ ul {
 }
 
 details {
-  margin: 10px 0;
+  margin: 20px 0;
 }
 
 details:not([open]) summary {
@@ -87,6 +87,10 @@ details:not([open]) summary {
   color: var(--subtext);
 }
 
+summary {
+  cursor: pointer;
+}
+
 blockquote {
   margin: 10px 0;
   padding-left: 10px;
diff --git a/helper.php b/helper.php
index 3cb961c..dcb50aa 100644
--- a/helper.php
+++ b/helper.php
@@ -1,5 +1,13 @@
 <?php
 
+function strip_name(string $name): string {
+  if (str_contains($name, "$")) {
+    return explode("$", $name, 2)[1];
+  }
+
+  return $name;
+}
+
 function generate_id(): string {
   return hash("sha256", uniqid("", true));
 }
diff --git a/index.php b/index.php
index 4d341f5..f302da1 100644
--- a/index.php
+++ b/index.php
@@ -4,6 +4,7 @@ include "config.php";
 include "helper.php";
 
 $user = is_logged_in();
+$show_settings = false;
 
 if ($user === false) {
   include "boilerplate/head.php";
@@ -19,6 +20,7 @@ if ($user === false) {
   exit();
 } else if ($_SERVER["REQUEST_METHOD"] === "POST") {
   $intent = $_POST["intent"];
+  $show_settings = true;
 
   // TODO: update-texts
   if ($intent === "create-section") {
@@ -57,11 +59,12 @@ if ($user === false) {
       );
     }
   } else if ($intent === "create-item") {
+    $show_settings = false;
     $row_id = $_POST["row"];
     $date = strtotime($_POST["date"]);
     $description = $_POST["description"];
 
-    if (strlen($row_id) !== 64 || !preg_match("/^[a-f0-9]{64}/$", $row_id)) {
+    if (strlen($row_id) !== 64 || !preg_match("/^[a-f0-9]{64}$/", $row_id)) {
       $err = $lang["add"]["errors"]["invalid_id"];
     } else if ($date === false) {
       $err = $lang["add"]["errors"]["date"];
@@ -151,6 +154,8 @@ if ($user === false) {
   $del_type = explode("-", $_GET["del"])[0];
   $del_id = explode("-", $_GET["del"])[1];
 
+  $show_settings = $del_type !== "item";
+
   if (strlen($del_id) === 64 && preg_match("/^[a-f0-9]{64}$/", $del_id) && ($del_type === "item" || $del_type === "row" || $del_type === "section")) {
     pg_query($db, "DELETE FROM $del_type WHERE id='$del_id';");
   }
@@ -172,7 +177,7 @@ foreach ($sections as $section) {
   $rows = pg_fetch_all(pg_query($db, $q));
   $enable_optgroup = $show_subtitle || count($rows) !== 1;
 
-  $todo_list .= "<h3>" . htmlspecialchars($section["name"]) . "</h3>";
+  $todo_list .= "<h3>" . strip_name($section["name"]) . "</h3>";
   $section_conf .= "<blockquote>
     <div><label>
       {$lang['settings']['sections']['section']['title']}
@@ -202,10 +207,10 @@ foreach ($sections as $section) {
     }
 
     if ($first && !$show_subtitle) {
-      $select_options .= htmlspecialchars($section["name"]);
+      $select_options .= htmlspecialchars(strip_name($section["name"]));
     } else {
-      $select_options .= htmlspecialchars($row["name"]);
-      $todo_list .= "<strong>" . htmlspecialchars($row["name"]) . "</strong>";
+      $select_options .= htmlspecialchars(strip_name($row["name"]));
+      $todo_list .= "<strong>" . htmlspecialchars(strip_name($row["name"])) . "</strong>";
     }
 
     $section_conf .= "<blockquote><div><label>
@@ -293,7 +298,7 @@ foreach ($sections as $section) {
   <h2><?php echo $lang["list"]["title"]; ?></h2>
   <?php echo $todo_list; ?>
 
-  <details>
+  <details<?php if ($show_settings) { echo " open"; } ?>>
     <summary><?php echo $lang["settings"]["title"]; ?></summary>
 
     <div id="settings-container">
@@ -318,7 +323,12 @@ foreach ($sections as $section) {
 
         <h4><?php echo $lang["settings"]["sections"]["format"]["title"]; ?></h4>
         <ul>
-          <li><?php echo $lang["settings"]["sections"]["format"]["alphabetical"]; ?></li>
+          <li>
+            <?php echo $lang["settings"]["sections"]["format"]["alphabetical"]; ?>
+            <ul><li>
+              <?php echo $lang["settings"]["sections"]["format"]["alphabetical_bypass"]; ?>
+            </li></ul>
+          </li>
           <li><?php echo $lang["settings"]["sections"]["format"]["html"]; ?></li>
           <li>
             <?php echo $lang["settings"]["sections"]["format"]["replacements"]["title"] ?>
diff --git a/lang/en-US.json b/lang/en-US.json
index 80808f9..f8d6c55 100644
--- a/lang/en-US.json
+++ b/lang/en-US.json
@@ -75,6 +75,7 @@
 
         "title": "Formatting Information",
         "alphabetical": "Sorted alphabetically by row/section title",
+        "alphabetical_bypass": "Text before a <code>$</code> is hidden but sorted",
         "html": "Displayed as raw HTML"
       },
 
diff --git a/setup.php b/setup.php
index 706476d..e65c030 100644
--- a/setup.php
+++ b/setup.php
@@ -13,19 +13,19 @@ $queries = array(
   );",
   "CREATE TABLE IF NOT EXISTS section (
     id VARCHAR(64) PRIMARY KEY,
-    users VARCHAR(64) NOT NULL REFERENCES users(id),
+    users VARCHAR(64) NOT NULL REFERENCES users(id) ON DELETE CASCADE,
     name VARCHAR(128),
     show_subtitle BOOLEAN NOT NULL -- whether or not to separately show the name of the first item
   );",
   "CREATE TABLE IF NOT EXISTS row (
     id VARCHAR(64) PRIMARY KEY,
-    section VARCHAR(64) NOT NULL REFERENCES section(id),
+    section VARCHAR(64) NOT NULL REFERENCES section(id) ON DELETE CASCADE,
     name VARCHAR(128), -- ignored if first item and show_subtitle is enabled
     display_format VARCHAR(128) NOT NULL -- %t - date, %d - description, %C - start color, %c - end color
   );",
   "CREATE TABLE IF NOT EXISTS item (
     id VARCHAR(64) PRIMARY KEY,
-    row VARCHAR(64) NOT NULL REFERENCES row(id),
+    row VARCHAR(64) NOT NULL REFERENCES row(id) ON DELETE CASCADE,
     description VARCHAR(256) NOT NULL,
     date DATE NOT NULL
   );",