From 1c5b020a8736c5430c174b6f2a3c9060ce7b0a2a Mon Sep 17 00:00:00 2001
From: Joey Kimsey <Joey@JoeyKimsey.com>
Date: Fri, 20 Dec 2024 05:56:18 -0500
Subject: [PATCH] cleanup

---
 app/css/main-dark.css                          |  8 +++++++-
 app/models/user.php                            |  4 ++++
 app/plugins/blog/views/admin/list.html         |  2 +-
 app/plugins/bugreport/views/admin/list.html    |  2 +-
 app/plugins/bugreport/views/admin/view.html    |  2 +-
 app/plugins/comments/views/admin/list.html     |  2 +-
 app/plugins/contact/views/admin/list.html      |  2 +-
 app/plugins/contact/views/admin/view.html      |  2 +-
 app/plugins/subscribe/views/admin/list.html    |  2 +-
 app/templates/default/default.tpl              |  6 +++---
 app/views/admin/logs/admin.html                |  2 +-
 app/views/admin/logs/admin_list.html           |  2 +-
 app/views/admin/logs/error.html                |  2 +-
 app/views/admin/logs/error_list.html           |  2 +-
 app/views/admin/logs/login.html                |  2 +-
 app/views/admin/logs/login_list.html           |  2 +-
 app/views/admin/modules/plugins/enable.html    |  2 +-
 app/views/admin/modules/plugins/uninstall.html |  2 +-
 app/views/nav/usercp.html                      |  2 +-
 app/views/profile.html                         |  4 +++-
 app/views/user_cp/email_change.html            |  5 +++--
 app/views/user_cp/password_change.html         |  5 +++--
 app/views/user_cp/settings.html                | 11 ++++++-----
 23 files changed, 45 insertions(+), 30 deletions(-)

diff --git a/app/css/main-dark.css b/app/css/main-dark.css
index 64e5a25..c009477 100644
--- a/app/css/main-dark.css
+++ b/app/css/main-dark.css
@@ -21,10 +21,16 @@
 .bg-default {
     background-color: #2c2c2c;
 }
+.bg-none,.bg-warning {
+    color: #000 !important; 
+}
 .context-other {
     color: #000;
 }
-
+.accordion-button:not(.collapsed) {
+    color: #f5f5f5;
+    background-color: var(--bs-accordion-dark-active-bg);
+}
 body {
     background-image: linear-gradient(180deg, #2c2c2c, #1e1e1e 100px, #1e1e1e);
     color: #f5f5f5;
diff --git a/app/models/user.php b/app/models/user.php
index aa0f80d..5eb8a38 100644
--- a/app/models/user.php
+++ b/app/models/user.php
@@ -681,6 +681,10 @@ class User extends DatabaseModel {
             Debug::error( "User: $id not updated." );
             return false;
         }
+        if ( $id === App::$activeUser->ID ) {
+            $userData = $this->get( $id );
+            App::$activeUser = $userData;
+        }
         return true;
     }
 
diff --git a/app/plugins/blog/views/admin/list.html b/app/plugins/blog/views/admin/list.html
index cda9d33..62df2fb 100644
--- a/app/plugins/blog/views/admin/list.html
+++ b/app/plugins/blog/views/admin/list.html
@@ -14,7 +14,7 @@
                     <th style="width: 5%"></th>
                     <th style="width: 5%"></th>
                     <th style="width: 10%">
-                        <INPUT type="checkbox" onchange="checkAll(this)" name="check.b" value="B_[]">
+                        <input type="checkbox" onchange="checkAll(this)" name="check.b" value="B_[]">
                     </th>
                 </tr>
             </thead>
diff --git a/app/plugins/bugreport/views/admin/list.html b/app/plugins/bugreport/views/admin/list.html
index f60c504..87cccb9 100644
--- a/app/plugins/bugreport/views/admin/list.html
+++ b/app/plugins/bugreport/views/admin/list.html
@@ -12,7 +12,7 @@
 					<th style="width: 5%"></th>
 					<th style="width: 5%"></th>
 					<th style="width: 5%">
-						<INPUT type="checkbox" onchange="checkAll(this)" name="check.br" value="BR_[]">
+						<input type="checkbox" onchange="checkAll(this)" name="check.br" value="BR_[]">
 					</th>
 				</tr>
 			</thead>
diff --git a/app/plugins/bugreport/views/admin/view.html b/app/plugins/bugreport/views/admin/view.html
index 565e6a1..9054ea7 100644
--- a/app/plugins/bugreport/views/admin/view.html
+++ b/app/plugins/bugreport/views/admin/view.html
@@ -57,7 +57,7 @@
                 <div class="card-footer text-center">
 					{ADMIN}
 					<form action="{ROOT_URL}admin/bugreport/delete" method="post">
-						<INPUT type="hidden" name="BR_" value="{ID}">
+						<input type="hidden" name="BR_" value="{ID}">
 						<input type="hidden" name="token" value="{TOKEN}">
 						<button name="submit" value="submit" type="submit" class="btn btn-sm btn-danger"><i class="fa fa-fw fa-trash"></i></button>
 					</form>
diff --git a/app/plugins/comments/views/admin/list.html b/app/plugins/comments/views/admin/list.html
index 637ecd9..33b160e 100644
--- a/app/plugins/comments/views/admin/list.html
+++ b/app/plugins/comments/views/admin/list.html
@@ -13,7 +13,7 @@
                     <th style="width: 5%"></th>
                     <th style="width: 5%"></th>
                     <th style="width: 5%">
-                        <INPUT type="checkbox" onchange="checkAll(this)" name="check.c" value="C_[]">
+                        <input type="checkbox" onchange="checkAll(this)" name="check.c" value="C_[]">
                     </th>
                 </tr>
             </thead>
diff --git a/app/plugins/contact/views/admin/list.html b/app/plugins/contact/views/admin/list.html
index 8efd9e4..f155fe5 100644
--- a/app/plugins/contact/views/admin/list.html
+++ b/app/plugins/contact/views/admin/list.html
@@ -12,7 +12,7 @@
 					<th style="width: 5%"></th>
 					<th style="width: 5%"></th>
 					<th style="width: 5%">
-						<INPUT type="checkbox" onchange="checkAll(this)" name="check.f" value="F_[]">
+						<input type="checkbox" onchange="checkAll(this)" name="check.f" value="F_[]">
 					</th>
 				</tr>
 			</thead>
diff --git a/app/plugins/contact/views/admin/view.html b/app/plugins/contact/views/admin/view.html
index ae92d3f..8daf820 100644
--- a/app/plugins/contact/views/admin/view.html
+++ b/app/plugins/contact/views/admin/view.html
@@ -49,7 +49,7 @@
                 <div class="card-footer text-center">
 					{ADMIN}
 					<form action="{ROOT_URL}admin/contact/delete" method="post">
-						<INPUT type="hidden" name="F_" value="{ID}">
+						<input type="hidden" name="F_" value="{ID}">
 						<input type="hidden" name="token" value="{TOKEN}">
 						<button name="submit" value="submit" type="submit" class="btn btn-sm btn-danger"><i class="fa fa-fw fa-trash"></i></button>
 					</form>
diff --git a/app/plugins/subscribe/views/admin/list.html b/app/plugins/subscribe/views/admin/list.html
index 12470c3..c775594 100644
--- a/app/plugins/subscribe/views/admin/list.html
+++ b/app/plugins/subscribe/views/admin/list.html
@@ -10,7 +10,7 @@
 					<th style="width: 85%">email</th>
 					<th style="width: 5%"></th>
 					<th style="width: 5%">
-						<INPUT type="checkbox" onchange="checkAll(this)" name="check.s" value="S_[]">
+						<input type="checkbox" onchange="checkAll(this)" name="check.s" value="S_[]">
 					</th>
 				</tr>
 			</thead>
diff --git a/app/templates/default/default.tpl b/app/templates/default/default.tpl
index 43899dd..1cd2e28 100644
--- a/app/templates/default/default.tpl
+++ b/app/templates/default/default.tpl
@@ -70,9 +70,9 @@
             {FOOT}
         </div>
         <!-- Bootstrap core JavaScript and jquery -->
-        <script language="JavaScript" crossorigin="anonymous" type="text/javascript" src="{JQUERY_CDN}jquery.min.js"></script>
-        <script language="JavaScript" crossorigin="anonymous" type="text/javascript" src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.6/dist/umd/popper.min.js"></script>
-        <script language="JavaScript" crossorigin="anonymous" type="text/javascript" src="{BOOTSTRAP_CDN}js/bootstrap.min.js"></script>
+        <script crossorigin="anonymous" src="{JQUERY_CDN}jquery.min.js"></script>
+        <script crossorigin="anonymous" src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.6/dist/umd/popper.min.js"></script>
+        <script crossorigin="anonymous" src="{BOOTSTRAP_CDN}js/bootstrap.min.js"></script>
         <!-- Custom javascript for this template -->
         {TEMPLATE_JS_INCLUDES}
     </body>
diff --git a/app/views/admin/logs/admin.html b/app/views/admin/logs/admin.html
index d8698c2..0d1ee41 100644
--- a/app/views/admin/logs/admin.html
+++ b/app/views/admin/logs/admin.html
@@ -44,7 +44,7 @@
                 <div class="card-footer text-center">
 					{ADMIN}
 					<form action="{ROOT_URL}admin/admin/delete" method="post">
-						<INPUT type="hidden" name="L_" value="{ID}">
+						<input type="hidden" name="L_" value="{ID}">
 						<input type="hidden" name="token" value="{TOKEN}">
 						<button name="submit" value="submit" type="submit" class="btn btn-sm btn-danger"><i class="fa fa-fw fa-trash"></i></button>
 					</form>
diff --git a/app/views/admin/logs/admin_list.html b/app/views/admin/logs/admin_list.html
index 5217455..4c466af 100644
--- a/app/views/admin/logs/admin_list.html
+++ b/app/views/admin/logs/admin_list.html
@@ -12,7 +12,7 @@
 					<th style="width: 5%"></th>
 					<th style="width: 5%"></th>
 					<th style="width: 5%"">
-						<INPUT type="checkbox" onchange="checkAll(this)" name="check.l" value="A_[]">
+						<input type="checkbox" onchange="checkAll(this)" name="check.l" value="A_[]">
 					</th>
 				</tr>
 			</thead>
diff --git a/app/views/admin/logs/error.html b/app/views/admin/logs/error.html
index a045581..dc043ba 100644
--- a/app/views/admin/logs/error.html
+++ b/app/views/admin/logs/error.html
@@ -54,7 +54,7 @@
                 <div class="card-footer text-center">
 					{ADMIN}
 					<form action="{ROOT_URL}admin/errors/delete" method="post">
-						<INPUT type="hidden" name="E_" value="{ID}">
+						<input type="hidden" name="E_" value="{ID}">
 						<input type="hidden" name="token" value="{TOKEN}">
 						<button name="submit" value="submit" type="submit" class="btn btn-sm btn-danger"><i class="fa fa-fw fa-trash"></i></button>
 					</form>
diff --git a/app/views/admin/logs/error_list.html b/app/views/admin/logs/error_list.html
index d2cd8a7..33c8b5d 100644
--- a/app/views/admin/logs/error_list.html
+++ b/app/views/admin/logs/error_list.html
@@ -12,7 +12,7 @@
                     <th style="width: 5%"></th>
                     <th style="width: 5%"></th>
                     <th style="width: 5%">
-                        <INPUT type="checkbox" onchange="checkAll(this)" name="check.e" value="E_[]">
+                        <input type="checkbox" onchange="checkAll(this)" name="check.e" value="E_[]">
                     </th>
                 </tr></thead><tbody>
                 {LOOP}
diff --git a/app/views/admin/logs/login.html b/app/views/admin/logs/login.html
index 5e85944..3036d6b 100644
--- a/app/views/admin/logs/login.html
+++ b/app/views/admin/logs/login.html
@@ -44,7 +44,7 @@
                 <div class="card-footer text-center">
 					{ADMIN}
 					<form action="{ROOT_URL}admin/logins/delete" method="post">
-						<INPUT type="hidden" name="L_" value="{ID}">
+						<input type="hidden" name="L_" value="{ID}">
 						<input type="hidden" name="token" value="{TOKEN}">
 						<button name="submit" value="submit" type="submit" class="btn btn-sm btn-danger"><i class="fa fa-fw fa-trash"></i></button>
 					</form>
diff --git a/app/views/admin/logs/login_list.html b/app/views/admin/logs/login_list.html
index e502335..e2f2e76 100644
--- a/app/views/admin/logs/login_list.html
+++ b/app/views/admin/logs/login_list.html
@@ -12,7 +12,7 @@
 					<th style="width: 5%"></th>
 					<th style="width: 5%"></th>
 					<th style="width: 5%"">
-						<INPUT type="checkbox" onchange="checkAll(this)" name="check.l" value="L_[]">
+						<input type="checkbox" onchange="checkAll(this)" name="check.l" value="L_[]">
 					</th>
 				</tr>
 			</thead>
diff --git a/app/views/admin/modules/plugins/enable.html b/app/views/admin/modules/plugins/enable.html
index 85a42d9..d4c8e07 100644
--- a/app/views/admin/modules/plugins/enable.html
+++ b/app/views/admin/modules/plugins/enable.html
@@ -6,7 +6,7 @@
         <p>Are you absolutely <b>SURE</b> you wish to <b>Enable</b> this plugin?</p>
         <p>The Tempus Project cannot guarantee the safety or effectiveness of any plugins not offered directly from the organization's GitHub at <a href="https://github.com/TheTempusProject">The Tempus Project</a></p>
         <form method="post">
-            <button name="submit" value="submit" type="submit" class="btn btn-lg btn-primary center-block">Enable</button>
+            <button name="submit" value="submit" type="submit" class="btn btn-lg btn-success center-block">Enable</button>
             <input type="hidden" name="installHash" value="{TOKEN}">
         </form>
     </div>
diff --git a/app/views/admin/modules/plugins/uninstall.html b/app/views/admin/modules/plugins/uninstall.html
index ee04228..84e4dc3 100644
--- a/app/views/admin/modules/plugins/uninstall.html
+++ b/app/views/admin/modules/plugins/uninstall.html
@@ -5,7 +5,7 @@
     <div class="col-lg-6 offset-md-3 text-center">
         <p>Are you sure you would like to uninstall this plugin and all of its components? There is no guarantee that your site will continue to run without error.</p>
         <form method="post">
-            <button name="submit" value="submit" type="submit" class="btn btn-lg btn-primary center-block">Uninstall</button>
+            <button name="submit" value="submit" type="submit" class="btn btn-lg btn-outline-danger center-block">Uninstall</button>
             <input type="hidden" name="uninstallHash" value="{TOKEN}">
         </form>
     </div>
diff --git a/app/views/nav/usercp.html b/app/views/nav/usercp.html
index 7bf679f..f2df261 100644
--- a/app/views/nav/usercp.html
+++ b/app/views/nav/usercp.html
@@ -1,4 +1,4 @@
-<ul class="nav nav-tabs justify-content-center" role="tablist">
+<ul class="nav nav-tabs justify-content-center my-3" role="tablist">
     {LOOP}
     <li class="nav-item context-main-bg mx-1"><a href="{url}" class="nav-link context-main">{name}</a></li>
     {/LOOP}
diff --git a/app/views/profile.html b/app/views/profile.html
index 542e6c5..f98bd50 100644
--- a/app/views/profile.html
+++ b/app/views/profile.html
@@ -1,4 +1,6 @@
-<div class="container py-4">
+<div class="container py-4 context-main-bg my-4">
+    <h3 class="mb-4 text-center">Profile</h3>
+    <hr>
     <div class="row justify-content-center">
         <div class="col-md-8">
             <div class="card shadow">
diff --git a/app/views/user_cp/email_change.html b/app/views/user_cp/email_change.html
index bad9fa2..e909b52 100644
--- a/app/views/user_cp/email_change.html
+++ b/app/views/user_cp/email_change.html
@@ -1,8 +1,9 @@
-<div class="container py-4">
+<div class="container py-4 context-main-bg my-4 text-center">
+    <h3 class="mb-4">Email Settings</h3>
+    <hr>
     <div class="row justify-content-center">
         <div class="col-md-4">
             <form action="" method="post">
-                <legend>Email Settings</legend>
                 <fieldset>
                     <div class="mb-3">
                         <label for="email" class="form-label">New Email:</label>
diff --git a/app/views/user_cp/password_change.html b/app/views/user_cp/password_change.html
index 4e9ffbe..e808d69 100644
--- a/app/views/user_cp/password_change.html
+++ b/app/views/user_cp/password_change.html
@@ -1,8 +1,9 @@
-<div class="container py-4">
+<div class="container py-4 context-main-bg my-4 text-center">
+    <h3 class="mb-4">Change Password</h3>
+    <hr>
     <div class="row justify-content-center">
         <div class="col-md-4">
             <form action="" method="post">
-                <legend>Change Password</legend>
                 <fieldset>
                     <div class="mb-3">
                         <label for="curpass" class="form-label">Current Password:</label>
diff --git a/app/views/user_cp/settings.html b/app/views/user_cp/settings.html
index 8096005..565eb61 100644
--- a/app/views/user_cp/settings.html
+++ b/app/views/user_cp/settings.html
@@ -1,13 +1,14 @@
-<div class="container py-4">
+<div class="container py-4 context-main-bg my-4 text-center">
+    <h3 class="mb-4">Preferences</h3>
+    <hr>
     <div class="row justify-content-center">
         <div class="col-md-4">
-            <form action="" method="post" class="form-horizontal"  enctype="multipart/form-data">
-                <legend>Preferences</legend>
+            <form action="" method="post" class="">
                 <fieldset>
-                {PREFERENCES_FORM}
+                    {PREFERENCES_FORM}
                 </fieldset>
                 <input type="hidden" name="token" value="{TOKEN}">
-                <button name="submit" value="submit" type="submit" class="btn btn-primary">Update</button>
+                <button name="submit" value="submit" type="submit" class="btn btn-lg btn-primary center-block">Update</button><br>
             </form>
         </div>
     </div>