PUSH

-> Update how custom css works -> Fixed show all tickets problem
MythicalLTD · Oct 18, 2023 · 05d5904 · 05d5904
1 parent 7cdb6b9
commit 05d5904
Show file tree

Hide file tree

Showing 29 changed files with 46 additions and 67 deletions.
diff --git a/view/admin/api/main.php b/view/admin/api/main.php
@@ -14,7 +14,7 @@
 ?>
 
 <!DOCTYPE html>
-<html lang="en" class="light-style layout-navbar-fixed layout-menu-fixed" dir="ltr" data-theme="theme-semi-dark"
+<html lang="en" class="dark-style layout-navbar-fixed layout-menu-fixed" dir="ltr" data-theme="theme-semi-dark"
     data-assets-path="/assets/" data-template="vertical-menu-template">
 
 <head>

diff --git a/view/admin/eggs/main.php b/view/admin/eggs/main.php
@@ -19,7 +19,7 @@
 ?>
 
 <!DOCTYPE html>
-<html lang="en" class="light-style layout-navbar-fixed layout-menu-fixed" dir="ltr" data-theme="theme-semi-dark"
+<html lang="en" class="dark-style layout-navbar-fixed layout-menu-fixed" dir="ltr" data-theme="theme-semi-dark"
     data-assets-path="<?= $appURL ?>/assets/" data-template="vertical-menu-template">
 
 <head>

diff --git a/view/admin/locations/main.php b/view/admin/locations/main.php
@@ -19,7 +19,7 @@
 ?>
 
 <!DOCTYPE html>
-<html lang="en" class="light-style layout-navbar-fixed layout-menu-fixed" dir="ltr" data-theme="theme-semi-dark"
+<html lang="en" class="dark-style layout-navbar-fixed layout-menu-fixed" dir="ltr" data-theme="theme-semi-dark"
     data-assets-path="<?= $appURL ?>/assets/" data-template="vertical-menu-template">
 
 <head>

diff --git a/view/admin/redeem/main.php b/view/admin/redeem/main.php
@@ -14,7 +14,7 @@
 ?>
 
 <!DOCTYPE html>
-<html lang="en" class="light-style layout-navbar-fixed layout-menu-fixed" dir="ltr" data-theme="theme-semi-dark"
+<html lang="en" class="dark-style layout-navbar-fixed layout-menu-fixed" dir="ltr" data-theme="theme-semi-dark"
     data-assets-path="/assets/" data-template="vertical-menu-template">
 
 <head>

diff --git a/view/admin/settings/main.php b/view/admin/settings/main.php
@@ -5,7 +5,7 @@
 ?>
 <!DOCTYPE html>
 
-<html lang="en" class="light-style layout-navbar-fixed layout-menu-fixed" dir="ltr" data-theme="theme-semi-dark"
+<html lang="en" class="dark-style layout-navbar-fixed layout-menu-fixed" dir="ltr" data-theme="theme-semi-dark"
     data-assets-path="/assets/" data-template="vertical-menu-template">
 
 <head>

diff --git a/view/admin/tickets/list.php b/view/admin/tickets/list.php
@@ -19,7 +19,7 @@
 $totalPages = ceil($totalTickets / $ticketsPerPage);
 ?>
 <!DOCTYPE html>
-<html lang="en" class="light-style layout-navbar-fixed layout-menu-fixed" dir="ltr" data-theme="theme-semi-dark"
+<html lang="en" class="dark-style layout-navbar-fixed layout-menu-fixed" dir="ltr" data-theme="theme-semi-dark"
     data-assets-path="<?= $appURL ?>/assets/" data-template="vertical-menu-template">
 
 <head>

diff --git a/view/admin/users/edit_user.php b/view/admin/users/edit_user.php
@@ -98,7 +98,7 @@
 }
 ?>
 <!DOCTYPE html>
-<html lang="en" class="light-style layout-navbar-fixed layout-menu-fixed" dir="ltr" data-theme="theme-semi-dark"
+<html lang="en" class="dark-style layout-navbar-fixed layout-menu-fixed" dir="ltr" data-theme="theme-semi-dark"
     data-assets-path="<?= $appURL ?>/assets/" data-template="vertical-menu-template">
 
 <head>

diff --git a/view/admin/users/new_user.php b/view/admin/users/new_user.php
@@ -30,7 +30,7 @@
 }
 ?>
 <!DOCTYPE html>
-<html lang="en" class="light-style layout-navbar-fixed layout-menu-fixed" dir="ltr" data-theme="theme-semi-dark"
+<html lang="en" class="dark-style layout-navbar-fixed layout-menu-fixed" dir="ltr" data-theme="theme-semi-dark"
     data-assets-path="<?= $appURL ?>/assets/" data-template="vertical-menu-template">
 
 <head>

diff --git a/view/admin/users/view_users.php b/view/admin/users/view_users.php
@@ -19,7 +19,7 @@
 ?>
 
 <!DOCTYPE html>
-<html lang="en" class="light-style layout-navbar-fixed layout-menu-fixed" dir="ltr" data-theme="theme-semi-dark"
+<html lang="en" class="dark-style layout-navbar-fixed layout-menu-fixed" dir="ltr" data-theme="theme-semi-dark"
     data-assets-path="<?= $appURL ?>/assets/" data-template="vertical-menu-template">
 
 <head>

diff --git a/view/auth/forgot-password.php b/view/auth/forgot-password.php
@@ -228,7 +228,7 @@
             die();
         }
     } else {
-        header('location: /auth/forgot-password?e=The request you sen`t dose not exist');
+        header("location: /auth/forgot-password?e=The request you sen't dose not exist");
         die();
     }
 }
@@ -290,23 +290,13 @@
 
                     }
                     ?>
-                    <form id="formAuthentication" class="mb-3" method="POST">
+                    <form class="mb-3" method="POST">
                         <div class="mb-3">
                             <label for="email" class="form-label">Email</label>
                             <input type="email" class="form-control" id="email" name="email"
                                 placeholder="Enter your email" autofocus />
                         </div>
                         <?= $csrf->input('forgot-password-form'); ?>
-                        <?php
-                        if (!$settings['reCAPTCHA_sitekey'] == "") {
-                            ?>
-                            <center>
-                                <div class="g-recaptcha" data-sitekey="<?= $settings['reCAPTCHA_sitekey'] ?>"></div>
-                            </center>
-                            &nbsp;
-                            <?php
-                        }
-                        ?>
                         <button name="reset_password" value="true" class="btn btn-primary d-grid w-100">Send Reset
                             Link</button>
                     </form>

diff --git a/view/blank.php b/view/blank.php
@@ -3,7 +3,7 @@
 ?>
 <!DOCTYPE html>
 
-<html lang="en" class="light-style layout-navbar-fixed layout-menu-fixed" dir="ltr" data-theme="theme-semi-dark"
+<html lang="en" class="dark-style layout-navbar-fixed layout-menu-fixed" dir="ltr" data-theme="theme-semi-dark"
   data-assets-path="<?= $appURL ?>/assets/" data-template="vertical-menu-template">
 
 <head>

diff --git a/view/components/navbar.php b/view/components/navbar.php
@@ -8,11 +8,13 @@
 
   <div class="navbar-nav-right d-flex align-items-center" id="navbar-collapse">
     <ul class="navbar-nav flex-row align-items-center ms-auto">
-      <li class="nav-item me-2 me-xl-0">
-        <a class="nav-link style-switcher-toggle hide-arrow" href="javascript:void(0);">
-          <i class="ti ti-md"></i>
-        </a>
-      </li>
+      <?php if ($settings['customcss_enabled'] == "false") { ?>
+        <li class="nav-item me-2 me-xl-0">
+          <a class="nav-link style-switcher-toggle hide-arrow" href="javascript:void(0);">
+            <i class="ti ti-md"></i>
+          </a>
+        </li>
+      <?php } ?>
       <li class="nav-item dropdown-notifications navbar-dropdown dropdown me-3 me-xl-1">
         <a class="nav-link dropdown-toggle hide-arrow" href="javascript:void(0);" data-bs-toggle="dropdown"
           data-bs-auto-close="outside" aria-expanded="false">
@@ -81,9 +83,10 @@ class="dropdown-item d-flex justify-content-center text-primary p-2 h-px-40 mb-1
                 </div>
                 <div class="flex-grow-1">
                   <span class="fw-semibold d-block">
-                    <?= $userdb['username'] ?> (<?= $userdb['role'] ?>)
-                  </span> 
-
+                    <?= $userdb['username'] ?> (
+                    <?= $userdb['role'] ?>)
+                  </span>
+
                   <!--<small class="text-muted"><?= $userdb['role'] ?></small><br>-->
                   <small class="text-muted">
                     <?= $userdb['coins'] ?> coins

diff --git a/view/dashboard.php b/view/dashboard.php
@@ -65,8 +65,7 @@ function percentage($number, $total, $outof)
 
 ?>
 <!DOCTYPE html>
-
-<html lang="en" class="light-style layout-navbar-fixed layout-menu-fixed" dir="ltr" data-theme="theme-semi-dark"
+<html lang="en" class="dark-style layout-navbar-fixed layout-menu-fixed" dir="ltr" data-theme="theme-semi-dark"
    data-assets-path="<?= $appURL ?>/assets/" data-template="vertical-menu-template">
 
 <head>

diff --git a/view/earn/afk.php b/view/earn/afk.php
@@ -52,7 +52,7 @@ function minutesToSeconds($minutes)
 ?>
 <!DOCTYPE html>
 
-<html lang="en" class="light-style layout-navbar-fixed layout-menu-fixed" dir="ltr" data-theme="theme-semi-dark"
+<html lang="en" class="dark-style layout-navbar-fixed layout-menu-fixed" dir="ltr" data-theme="theme-semi-dark"
     data-assets-path="<?= $appURL ?>/assets/" data-template="vertical-menu-template">
 
 <head>

diff --git a/view/earn/redeem.php b/view/earn/redeem.php
@@ -44,7 +44,7 @@
 ?>
 <!DOCTYPE html>
 
-<html lang="en" class="light-style layout-navbar-fixed layout-menu-fixed" dir="ltr" data-theme="theme-semi-dark"
+<html lang="en" class="dark-style layout-navbar-fixed layout-menu-fixed" dir="ltr" data-theme="theme-semi-dark"
     data-assets-path="<?= $appURL ?>/assets/" data-template="vertical-menu-template">
 
 <head>

diff --git a/view/help-center.php b/view/help-center.php
@@ -3,7 +3,7 @@
 ?>
 <!DOCTYPE html>
 
-<html lang="en" class="light-style layout-navbar-fixed layout-menu-fixed" dir="ltr" data-theme="theme-semi-dark"
+<html lang="en" class="dark-style layout-navbar-fixed layout-menu-fixed" dir="ltr" data-theme="theme-semi-dark"
   data-assets-path="<?= $appURL ?>/assets/" data-template="vertical-menu-template">
 
 <head>

diff --git a/view/legal/privacypolicy.php b/view/legal/privacypolicy.php
@@ -3,7 +3,7 @@
 ?>
 <!DOCTYPE html>
 
-<html lang="en" class="light-style layout-navbar-fixed layout-menu-fixed" dir="ltr" data-theme="theme-semi-dark"
+<html lang="en" class="dark-style layout-navbar-fixed layout-menu-fixed" dir="ltr" data-theme="theme-semi-dark"
   data-assets-path="<?= $appURL ?>/assets/" data-template="vertical-menu-template">
 
 <head>

diff --git a/view/legal/termsofservice.php b/view/legal/termsofservice.php
@@ -3,7 +3,7 @@
 ?>
 <!DOCTYPE html>
 
-<html lang="en" class="light-style layout-navbar-fixed layout-menu-fixed" dir="ltr" data-theme="theme-semi-dark"
+<html lang="en" class="dark-style layout-navbar-fixed layout-menu-fixed" dir="ltr" data-theme="theme-semi-dark"
   data-assets-path="<?= $appURL ?>/assets/" data-template="vertical-menu-template">
 
 <head>

diff --git a/view/requirements/head.php b/view/requirements/head.php
@@ -41,7 +41,10 @@ class="template-customizer-theme-css" />
 <link rel="stylesheet" href="<?= $appURL ?>/assets/vendor/libs/bootstrap-select/bootstrap-select.css" />
 <link rel="stylesheet" href="<?= $appURL ?>/assets/vendor/libs/select2/select2.css" />
 <script src="<?= $appURL ?>/assets/vendor/js/helpers.js"></script>
-<script src="<?= $appURL ?>/assets/vendor/js/template-customizer.js"></script>
+<?php if ($settings['customcss_enabled'] == "false") { ?>
+    <script src="<?= $appURL ?>/assets/vendor/js/template-customizer.js"></script>
+<?php } ?>
+
 <script src="<?= $appURL ?>/assets/js/config.js"></script>
 <link rel="stylesheet" href="<?= $appURL ?>/assets/css/preloader.css" />
 <style>

diff --git a/view/server/create.php b/view/server/create.php
@@ -201,7 +201,7 @@
 ?>
 <!DOCTYPE html>
 
-<html lang="en" class="light-style layout-navbar-fixed layout-menu-fixed" dir="ltr" data-theme="theme-semi-dark"
+<html lang="en" class="dark-style layout-navbar-fixed layout-menu-fixed" dir="ltr" data-theme="theme-semi-dark"
   data-assets-path="<?= $appURL ?>/assets/" data-template="vertical-menu-template">
 
 <head>

diff --git a/view/server/edit.php b/view/server/edit.php
@@ -246,7 +246,7 @@
 ?>
 <!DOCTYPE html>
 
-<html lang="en" class="light-style layout-navbar-fixed layout-menu-fixed" dir="ltr" data-theme="theme-semi-dark"
+<html lang="en" class="dark-style layout-navbar-fixed layout-menu-fixed" dir="ltr" data-theme="theme-semi-dark"
     data-assets-path="<?= $appURL ?>/assets/" data-template="vertical-menu-template">
 
 <head>

diff --git a/view/store.php b/view/store.php
@@ -129,7 +129,7 @@
 ?>
 <!DOCTYPE html>
 
-<html lang="en" class="light-style layout-navbar-fixed layout-menu-fixed" dir="ltr" data-theme="theme-semi-dark"
+<html lang="en" class="dark-style layout-navbar-fixed layout-menu-fixed" dir="ltr" data-theme="theme-semi-dark"
     data-assets-path="<?= $appURL ?>/assets/" data-template="vertical-menu-template">
 
 <head>

diff --git a/view/tickets/chat.php b/view/tickets/chat.php
@@ -81,7 +81,7 @@
 ?>
 
 <!DOCTYPE html>
-<html lang="en" class="light-style layout-navbar-fixed layout-menu-fixed" dir="ltr" data-theme="theme-semi-dark"
+<html lang="en" class="dark-style layout-navbar-fixed layout-menu-fixed" dir="ltr" data-theme="theme-semi-dark"
     data-assets-path="<?= $appURL ?>/assets/" data-template="vertical-menu-template">
 
 <head>

diff --git a/view/tickets/list.php b/view/tickets/list.php
@@ -7,8 +7,11 @@
 
 $searchKeyword = isset($_GET['search']) ? $_GET['search'] : '';
 $searchCondition = '';
+$ownerKeyCondition = " `ownerkey` = '".mysqli_real_escape_string($conn, $_COOKIE['token'])."'";
 if (!empty($searchKeyword)) {
-    $searchCondition = " WHERE (`subject` LIKE '%$searchKeyword%' OR `description` LIKE '%$searchKeyword%')";
+    $searchCondition = " WHERE (`subject` LIKE '%$searchKeyword%' OR `description` LIKE '%$searchKeyword%') AND" . $ownerKeyCondition;
+} else {
+    $searchCondition = " WHERE" . $ownerKeyCondition;
 }
 $statusCondition = " `status` IN ('open', 'closed')";
 $tickets_query = "SELECT * FROM mythicaldash_tickets" . $searchCondition . ($searchCondition ? ' AND ' : ' WHERE ') . $statusCondition . " ORDER BY `id` LIMIT $offset, $ticketsPerPage";
@@ -19,7 +22,7 @@
 $totalPages = ceil($totalTickets / $ticketsPerPage);
 ?>
 <!DOCTYPE html>
-<html lang="en" class="light-style layout-navbar-fixed layout-menu-fixed" dir="ltr" data-theme="theme-semi-dark"
+<html lang="en" class="dark-style layout-navbar-fixed layout-menu-fixed" dir="ltr" data-theme="theme-semi-dark"
     data-assets-path="<?= $appURL ?>/assets/" data-template="vertical-menu-template">
 
 <head>

diff --git a/view/tickets/new.php b/view/tickets/new.php
@@ -1,7 +1,4 @@
 <?php
-use Livaco\EasyDiscordWebhook\DiscordWebhook;
-use Livaco\EasyDiscordWebhook\Objects\Embed;
-
 include(__DIR__ . '/../requirements/page.php');
 if (isset($_GET['subject']) && isset($_GET['priority']) && isset($_GET['description'])) {
     if (!$_GET['subject'] == "" && !$_GET['priority'] == "" && !$_GET['description'] == "") {
@@ -12,22 +9,6 @@
         $api_key = $userdb['api_key'];
         $conn->query("INSERT INTO `mythicaldash_tickets` (`ownerkey`, `ticketuuid`, `subject`, `priority`, `description`, `attachment`) VALUES ('".$api_key."', '".generate_keynoinfo()."', '".$subject."', '".$priority."', '".$description."', '".$attachment."');");
         $conn->close();
-        DiscordWebhook::new($settings['discord_webhook'])
-        ->addEmbed(Embed::new()
-            ->setTitle($settings['name']. " | New Ticket")
-            ->setDescription("Hi there it looks like you have a new ticket on the client area make sure to check it out!")
-            ->addField("Ticket Owner", $userdb['username'], false)
-            ->addField("Ticket priority", $priority, false)
-            ->addField("Ticket Subject", $subject, false)
-            ->addField("Ticket Description", $description, false)
-            ->addField("Ticket Attachment", $attachment, false)
-            ->addField("Ticket URL","https://test.test.test",false)
-            ->setFooter("Ticket created at " . date("Y-m-d H:i:s"))
-            ->setColor("#0x3498db")
-            ->setAuthor($settings['name'],$appURL,$settings['logo'])
-            ->setThumbnail($settings['logo'])
-        )
-        ->execute();
         NewTicket();
         header('location: /help-center/tickets');
         $conn->close();

diff --git a/view/user/connections.php b/view/user/connections.php
@@ -40,7 +40,7 @@
 }
 ?>
 <!DOCTYPE html>
-<html lang="en" class="light-style layout-navbar-fixed layout-menu-fixed" dir="ltr" data-theme="theme-semi-dark"
+<html lang="en" class="dark-style layout-navbar-fixed layout-menu-fixed" dir="ltr" data-theme="theme-semi-dark"
     data-assets-path="<?= $appURL ?>/assets/" data-template="vertical-menu-template">
 
 <head>

diff --git a/view/user/edit.php b/view/user/edit.php
@@ -40,7 +40,7 @@
 }
 ?>
 <!DOCTYPE html>
-<html lang="en" class="light-style layout-navbar-fixed layout-menu-fixed" dir="ltr" data-theme="theme-semi-dark"
+<html lang="en" class="dark-style layout-navbar-fixed layout-menu-fixed" dir="ltr" data-theme="theme-semi-dark"
     data-assets-path="<?= $appURL ?>/assets/" data-template="vertical-menu-template">
 
 <head>

diff --git a/view/user/list.php b/view/user/list.php
@@ -18,7 +18,7 @@
 ?>
 
 <!DOCTYPE html>
-<html lang="en" class="light-style layout-navbar-fixed layout-menu-fixed" dir="ltr" data-theme="theme-semi-dark"
+<html lang="en" class="dark-style layout-navbar-fixed layout-menu-fixed" dir="ltr" data-theme="theme-semi-dark"
     data-assets-path="<?= $appURL ?>/assets/" data-template="vertical-menu-template">
 
 <head>

diff --git a/view/user/profile.php b/view/user/profile.php
@@ -19,7 +19,7 @@
 }
 ?>
 <!DOCTYPE html>
-<html lang="en" class="light-style layout-navbar-fixed layout-menu-fixed" dir="ltr" data-theme="theme-semi-dark"
+<html lang="en" class="dark-style layout-navbar-fixed layout-menu-fixed" dir="ltr" data-theme="theme-semi-dark"
     data-assets-path="<?= $appURL ?>/assets/" data-template="vertical-menu-template">
 
 <head>