PUSH

-> Done #43
MythicalLTD · Aug 22, 2023 · 34e873c · 34e873c
1 parent e14b9c0
commit 34e873c
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 30 deletions.
diff --git a/view/admin/users/view_users.php b/view/admin/users/view_users.php
@@ -71,7 +71,7 @@
                         <div class="card">
                             <h5 class="card-header">
                                 Users
-                                <a href="/admin/users/new" class="btn btn-primary float-end">Create New User</a>
+                                <!--<a href="/admin/users/new" class="btn btn-primary float-end">Create New User</a>-->
                             </h5>
                             <div class="table-responsive text-nowrap">
                                 <table class="table">

diff --git a/view/auth/register.php b/view/auth/register.php
@@ -41,7 +41,7 @@
                         header('location: /auth/register?e=Please only use characters from A-Z in your last name!');
                         die();
                     }
-                    $password = password_hash($upassword, PASSWORD_DEFAULT);
+                    $password = password_hash($upassword, PASSWORD_BCRYPT);
                     $skey = generate_key($email, $password);
                     if (!$username == "" || !$email == "" || !$first_name == "" || !$last_name == "" || !$upassword == "") {
                         $check_query = "SELECT * FROM mythicaldash_users WHERE username = '$username' OR email = '$email'";

diff --git a/view/auth/reset-password.php b/view/auth/reset-password.php
@@ -13,7 +13,7 @@
                     if ($csrf->validate('reset-password-form')) {
                         $ucode = $conn->query("SELECT * FROM mythicaldash_resetpasswords WHERE `user-resetkeycode` = '" . $code . "'")->fetch_array();
                         $upassword = mysqli_real_escape_string($conn, $_GET['password']);
-                        $password = password_hash($upassword, PASSWORD_DEFAULT);
+                        $password = password_hash($upassword, PASSWORD_BCRYPT);
                         $conn->query("UPDATE `mythicaldash_users` SET `password` = '" . $password . "' WHERE `mythicaldash_users`.`api_key` = '" . $ucode['user-apikey'] . "';");
                         $conn->query("DELETE FROM mythicaldash_resetpasswords WHERE `mythicaldash_resetpasswords`.`id` = " . $ucode['id'] . "");
                         $conn->close();

diff --git a/view/components/sidebar.php b/view/components/sidebar.php
@@ -107,24 +107,11 @@ function is_active_page($page_urls)
           <div>Application API</div>
         </a>
       </li>
-      <li
-        class="menu-item <?php echo is_active_page(['/admin/users/view', '/admin/users/edit', '/admin/users/new']) ? 'active' : ''; ?>">
-        <a href="javascript:void(0);" class="menu-link menu-toggle">
+      <li class="menu-item <?php echo is_active_page(['/admin/users/view', '/admin/users/edit', '/admin/users/new']) ? 'active' : ''; ?>">
+        <a href="/admin/users/view" class="menu-link">
           <i class="menu-icon tf-icons ti ti-users"></i>
           <div>Users</div>
         </a>
-        <ul class="menu-sub">
-          <li class="menu-item <?php echo is_active_page(['/admin/users/view']) ? 'active' : ''; ?>">
-            <a href="/admin/users/view" class="menu-link">
-              <div>List</div>
-            </a>
-          </li>
-          <li class="menu-item <?php echo is_active_page(['/admin/users/new']) ? 'active' : ''; ?>">
-            <a href="/admin/users/new" class="menu-link">
-              <div>New</div>
-            </a>
-          </li>
-        </ul>
       </li>
       <li class="menu-item <?php echo is_active_page(['/admin/redeem']) ? 'active' : ''; ?>">
         <a href="/admin/redeem" class="menu-link">

diff --git a/view/dashboard.php b/view/dashboard.php
@@ -1,5 +1,8 @@
 <?php
 include('requirements/page.php');
+if ($userdb['panel_id'] == "CLI") {
+   header('location: /admin/settings');
+}
 $nuserdb = $conn->query("SELECT * FROM mythicaldash_users WHERE api_key = '" . mysqli_real_escape_string($conn, $_COOKIE['token']) . "'")->fetch_array();
 $servers = mysqli_query($conn, "SELECT * FROM mythicaldash_servers WHERE uid = '" . mysqli_real_escape_string($conn, $_COOKIE['token']) . "'");
 $servers_in_queue = mysqli_query($conn, "SELECT * FROM mythicaldash_servers_queue WHERE ownerid = '" . mysqli_real_escape_string($conn, $_COOKIE['token']) . "'");

diff --git a/view/earn/afk.php b/view/earn/afk.php
@@ -1,5 +1,8 @@
 <?php
 include(__DIR__ . '/../requirements/page.php');
+if ($userdb['panel_id'] == "CLI") {
+    header('location: /admin/settings');
+}
 if (isset($_GET['getcoins'])) {
     $coins = $userdb['coins'];
     $idlemins = $userdb['minutes_afk'];

diff --git a/view/earn/redeem.php b/view/earn/redeem.php
@@ -1,5 +1,8 @@
 <?php
 include(__DIR__ . '/../requirements/page.php');
+if ($userdb['panel_id'] == "CLI") {
+    header('location: /admin/settings');
+}
 if (isset($_GET['code']) && !$_GET['code'] == "") {
     $user_query = "SELECT * FROM mythicaldash_redeem WHERE code = ?";
     $stmt = mysqli_prepare($conn, $user_query);

diff --git a/view/server/create.php b/view/server/create.php
@@ -1,5 +1,8 @@
 <?php
 include(__DIR__ . '/../requirements/page.php');
+if ($userdb['panel_id'] == "CLI") {
+  header('location: /admin/settings');
+}
 include(__DIR__ . '/../../include/php-csrf.php');
 $csrf = new CSRF();
 

diff --git a/view/server/queueDelete.php b/view/server/queueDelete.php
@@ -1,6 +1,8 @@
 <?php
 include(__DIR__ . '/../requirements/page.php');
-
+if ($userdb['panel_id'] == "CLI") {
+    header('location: /admin/settings');
+}
 if (!is_numeric($_GET["server"])) {
     header("location: /dashboard?e=Server id is invalid.");
     die();

diff --git a/view/store.php b/view/store.php
@@ -1,6 +1,8 @@
 <?php
 include(__DIR__ . '/requirements/page.php');
-
+if ($userdb['panel_id'] == "CLI") {
+    header('location: /admin/settings');
+}
 $cpuprice = $settings["price_cpu"];
 $ramprice = $settings["price_memory"];
 $diskprice = $settings["price_disk_space"];
@@ -142,9 +144,9 @@
 </head>
 
 <body>
-  <div id="preloader" class="discord-preloader">
-    <div class="spinner"></div>
-  </div>
+    <div id="preloader" class="discord-preloader">
+        <div class="spinner"></div>
+    </div>
     <div class="layout-wrapper layout-content-navbar">
         <div class="layout-container">
             <?php include(__DIR__ . '/components/sidebar.php') ?>
@@ -170,8 +172,7 @@
                                                 <?= $settings['price_cpu'] ?> coins you get 1 CPU core to use on your
                                                 server.
                                             </p>
-                                            <a href="/store?buycpu"
-                                                class="btn btn-outline-primary waves-effect">Buy</a>
+                                            <a href="/store?buycpu" class="btn btn-outline-primary waves-effect">Buy</a>
                                         </div>
                                     </center>
                                 </div>
@@ -191,8 +192,7 @@ class="btn btn-outline-primary waves-effect">Buy</a>
                                                 <?= $settings['price_memory'] ?>
                                                 coins you get 1GB ram to use on your server.
                                             </p>
-                                            <a href="/store?buyram"
-                                                class="btn btn-outline-primary waves-effect">Buy</a>
+                                            <a href="/store?buyram" class="btn btn-outline-primary waves-effect">Buy</a>
                                         </div>
                                     </center>
                                 </div>
@@ -233,8 +233,7 @@ class="btn btn-outline-primary waves-effect">Buy</a>
                                                 <?= $settings['price_server_limit'] ?> coins you get 1 server slot to
                                                 deploy your server.
                                             </p>
-                                            <a href="/store?buysv"
-                                                class="btn btn-outline-primary waves-effect">Buy</a>
+                                            <a href="/store?buysv" class="btn btn-outline-primary waves-effect">Buy</a>
                                         </div>
                                     </center>
                                 </div>

diff --git a/view/user/resetpwd.php b/view/user/resetpwd.php
@@ -12,7 +12,7 @@
         if (mysqli_num_rows($result) > 0) {
             $user_info = $conn->query("SELECT * FROM mythicaldash_users WHERE api_key = '" . $_COOKIE['token'] . "'")->fetch_array();
             $upassword = mysqli_real_escape_string($conn,$_GET['pwd']);
-            $pwd = password_hash($upassword,PASSWORD_DEFAULT);
+            $pwd = password_hash($upassword,PASSWORD_BCRYPT);
             $conn->query("UPDATE `mythicaldash_users` SET `password` = '" . $pwd . "' WHERE `mythicaldash_users`.`api_key` = '" . $_COOKIE['token'] . "';");
             $conn->close();
             header('location: /user/profile?s=We updated the user settings in the database');