From 65e3c7b02f1c9e1d4934e5f34a733d08851c8363 Mon Sep 17 00:00:00 2001 From: Michael Erdely Date: Sat, 19 Oct 2024 00:20:57 -0400 Subject: [PATCH 1/3] re set up local config.php --- src/includes/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/includes/config.php b/src/includes/config.php index 532e0ae..1c490dd 100644 --- a/src/includes/config.php +++ b/src/includes/config.php @@ -78,7 +78,7 @@ function getGlobalOptions() { "email_xmailer" => "PHP/" . phpversion(), /* Application name. */ - "app_name" => "Test Gift Registry", + "app_name" => "Gift Registry", /* Whether or not to show brief blurbs in certain spots which describe how features work. From c8e0ae420e0fea258d9b1ecca82f3de0963b547e Mon Sep 17 00:00:00 2001 From: Michael Erdely Date: Sat, 19 Oct 2024 00:21:19 -0400 Subject: [PATCH 2/3] fix gitattributes --- .gitattributes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 9a0c70e..8c9c7e2 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1 @@ -includes/config.php merge=ours +src/includes/config.php merge=ours From add13754f597392a29442bafb1c2765c7d6214c3 Mon Sep 17 00:00:00 2001 From: Michael Erdely Date: Sat, 19 Oct 2024 00:38:16 -0400 Subject: [PATCH 3/3] handle event descriptions better; scroll to bottom with events --- src/event.php | 1 - src/templates/event.tpl | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/event.php b/src/event.php index 9a038dc..c91d0c3 100644 --- a/src/event.php +++ b/src/event.php @@ -71,7 +71,6 @@ $action = isset($_GET["action"]) ? $_GET["action"] : ""; if ($action == "insert" || $action == "update") { /* validate the data. */ $description = filter_var(trim($_GET["description"], FILTER_SANITIZE_STRING));; - $description = htmlspecialchars($description, ENT_QUOTES, 'UTF-8'); try { $eventdate = new DateTime($_GET["eventdate"]); } diff --git a/src/templates/event.tpl b/src/templates/event.tpl index 9213d95..aa17e33 100644 --- a/src/templates/event.tpl +++ b/src/templates/event.tpl @@ -156,5 +156,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA {include file='footer.tpl'} + {if isset($action) && $action == "edit"} {/if}