diff --git a/src/Controller/AdminController/AdminController.php b/src/Controller/AdminController/AdminController.php index 9b38efd..fffb607 100644 --- a/src/Controller/AdminController/AdminController.php +++ b/src/Controller/AdminController/AdminController.php @@ -55,7 +55,6 @@ class AdminController extends Controller { // User profile $username = trim($_POST['username'] ?? ''); $displayName = trim($_POST['display_name'] ?? ''); - $about = trim($_POST['about'] ?? ''); $website = trim($_POST['website'] ?? ''); // Site settings @@ -115,7 +114,6 @@ class AdminController extends Controller { $config->basePath = $basePath; $config->itemsPerPage = $itemsPerPage; $config->strictAccessibility = $strictAccessibility; - $config->showTickMood = $showTickMood; // Save site settings and reload config from database // TODO - raise and handle exception on failure @@ -124,7 +122,6 @@ class AdminController extends Controller { // Update user profile $user->username = $username; $user->displayName = $displayName; - $user->about = $about; $user->website = $website; // Save user profile and reload user from database diff --git a/src/Model/ConfigModel/ConfigModel.php b/src/Model/ConfigModel/ConfigModel.php index 7b4b17e..40736b5 100644 --- a/src/Model/ConfigModel/ConfigModel.php +++ b/src/Model/ConfigModel/ConfigModel.php @@ -9,7 +9,6 @@ class ConfigModel { public string $timezone = 'relative'; public ?int $cssId = null; public bool $strictAccessibility = true; - public bool $showTickMood = true; // load config from sqlite database public static function load(): self { @@ -25,8 +24,7 @@ class ConfigModel { base_path, items_per_page, css_id, - strict_accessibility, - show_tick_mood + strict_accessibility FROM settings WHERE id=1"); $row = $stmt->fetch(PDO::FETCH_ASSOC); @@ -39,7 +37,6 @@ class ConfigModel { $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']; } return $c; @@ -71,9 +68,8 @@ class ConfigModel { items_per_page, css_id, strict_accessibility, - show_tick_mood ) - VALUES (1, ?, ?, ?, ?, ?, ?, ?, ?)"); + VALUES (1, ?, ?, ?, ?, ?, ?, ?)"); } else { $stmt = $db->prepare("UPDATE settings SET site_title=?, @@ -82,8 +78,7 @@ class ConfigModel { base_path=?, items_per_page=?, css_id=?, - strict_accessibility=?, - show_tick_mood=? + strict_accessibility=? WHERE id=1"); } $stmt->execute([$this->siteTitle, @@ -93,7 +88,6 @@ class ConfigModel { $this->itemsPerPage, $this->cssId, $this->strictAccessibility, - $this->showTickMood ]); return self::load(); diff --git a/src/Model/UserModel/UserModel.php b/src/Model/UserModel/UserModel.php index d6676bc..0266dd0 100644 --- a/src/Model/UserModel/UserModel.php +++ b/src/Model/UserModel/UserModel.php @@ -3,7 +3,6 @@ class UserModel { // properties public string $username = ''; public string $displayName = ''; - public string $about = ''; public string $website = ''; public string $mood = ''; @@ -12,14 +11,13 @@ class UserModel { global $db; // There's only ever one user. I'm just leaning into that. - $stmt = $db->query("SELECT username, display_name, about, website, mood FROM user WHERE id=1"); + $stmt = $db->query("SELECT username, display_name, website, mood FROM user WHERE id=1"); $row = $stmt->fetch(PDO::FETCH_ASSOC); $u = new self(); if ($row) { $u->username = $row['username']; $u->displayName = $row['display_name']; - $u->about = $row['about'] ?? ''; $u->website = $row['website'] ?? ''; $u->mood = $row['mood'] ?? ''; } @@ -32,12 +30,12 @@ class UserModel { $userCount = (int) $db->query("SELECT COUNT(*) FROM user")->fetchColumn(); if ($userCount === 0){ - $stmt = $db->prepare("INSERT INTO user (id, username, display_name, about, website, mood) VALUES (1, ?, ?, ?, ?, ?)"); + $stmt = $db->prepare("INSERT INTO user (id, username, display_name, website, mood) VALUES (1, ?, ?, ?, ?, ?)"); } else { - $stmt = $db->prepare("UPDATE user SET username=?, display_name=?, about=?, website=?, mood=? WHERE id=1"); + $stmt = $db->prepare("UPDATE user SET username=?, display_name=?, website=?, mood=? WHERE id=1"); } - $stmt->execute([$this->username, $this->displayName, $this->about, $this->website, $this->mood]); + $stmt->execute([$this->username, $this->displayName, $this->website, $this->mood]); return self::load(); } diff --git a/templates/partials/admin.php b/templates/partials/admin.php index f8227db..64d5962 100644 --- a/templates/partials/admin.php +++ b/templates/partials/admin.php @@ -22,11 +22,6 @@ name="display_name" value="displayName) ?>" required> - - strictAccessibility): ?> checked > - - showTickMood): ?> checked >