From 0e34bd31193d55e5b7ff994ea275b79e9010be2c Mon Sep 17 00:00:00 2001
From: Greg Sarjeant <1686767+gsarjeant@users.noreply.github.com>
Date: Mon, 23 Jun 2025 14:32:41 -0400
Subject: [PATCH] Fix invalid HTML on CSS page. Fix ConfigModel.

---
 src/Model/ConfigModel/ConfigModel.php |  1 +
 templates/partials/css.php            | 10 ++++------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/Model/ConfigModel/ConfigModel.php b/src/Model/ConfigModel/ConfigModel.php
index 8c86b11..7b4b17e 100644
--- a/src/Model/ConfigModel/ConfigModel.php
+++ b/src/Model/ConfigModel/ConfigModel.php
@@ -37,6 +37,7 @@ class ConfigModel {
             $c->baseUrl = $row['base_url'];
             $c->basePath = $row['base_path'];
             $c->itemsPerPage = (int) $row['items_per_page'];
+            $c->cssId = (int) $row['css_id'];
             $c->strictAccessibility = (bool) $row['strict_accessibility'];
             $c->showTickMood = (bool) $row['show_tick_mood'];
         }
diff --git a/templates/partials/css.php b/templates/partials/css.php
index ade0d2b..91826fd 100644
--- a/templates/partials/css.php
+++ b/templates/partials/css.php
@@ -8,18 +8,16 @@
                     <legend>Manage</legend>
                     <div class="fieldset-items">
                         <label for="selectCssFile">Select CSS File</label>
-                        <select id="selectCssFile" name="selectCssFile" value=<?= $config->cssId ?>>
-                            <option value="">Default</option>
+                        <select id="selectCssFile" name="selectCssFile">
+                            <option value="" <?php if(!$config->cssId): ?>selected<?php endif; ?>>Default</option>
 <?php foreach ($customCss as $cssFile): ?>
     <?php
-        if ($cssFile['id'] == $config->cssId){
+        if ((int) $cssFile['id'] == $config->cssId){
             $cssDescription = $cssFile['description'];
             $selected = "selected";
         }
     ?>
-
-                            <option value=<?= $cssFile['id'] ?>
-                                    <?= isset($selected) ? $selected : ""?>>
+                            <option value="<?= $cssFile['id'] ?>"<?= isset($selected) ? $selected : ""?>>
                                     <?=Util::escape_html($cssFile['filename'])?>
                             </option>
 <?php endforeach; ?>