Fix login/join.

PixelsetDev · Nov 13, 2024 · 3922c80 · 3922c80
1 parent 5372edb
commit 3922c80
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 23 deletions.
diff --git a/.idea/php.xml b/.idea/php.xml
diff --git a/Plugins/ControlPanel/Checksums.php b/Plugins/ControlPanel/Checksums.php
@@ -7,24 +7,19 @@ class Checksums
     public function Validate()
     {
         $CoreSettings = hash_file('sha3-512', __DIR__.'/../../Settings/Settings.php');
-        $CoreDeveloper = hash_file('sha3-512', __DIR__.'/../../Settings/Developer.php');
 
         require_once __DIR__.'/Assets/ChkValues.php';
         if ($Checksum['CoreSettings'] !== $CoreSettings) {
             return false;
         }
-        if ($Checksum['CoreDeveloper'] !== $CoreDeveloper) {
-            return false;
-        }
 
         return true;
     }
 
     public function Reset()
     {
         $CoreSettings = hash_file('sha3-512', __DIR__.'/../../Settings/Settings.php');
-        $CoreDeveloper = hash_file('sha3-512', __DIR__.'/../../Settings/Developer.php');
-        $Data = '<?php $Checksum[\'CoreSettings\'] = \''.$CoreSettings.'\'; $Checksum[\'CoreDeveloper\'] = \''.$CoreDeveloper.'\';';
+        $Data = '<?php $Checksum[\'CoreSettings\'] = \''.$CoreSettings.'\';';
         file_put_contents(__DIR__.'/Assets/ChkValues.php', $Data);
     }
 }
diff --git a/Plugins/ControlPanel/Views/Login.php b/Plugins/ControlPanel/Views/Login.php
@@ -32,7 +32,7 @@
                 <?php if (isset($_GET['success'])) { ?>
                     <div class="alert-success">
                         <div class="alert-success-icon">
-                            <i class="fas fa-exclamation-triangle"></i>
+                            <i class="fas fa-circle-check"></i>
                         </div>
                         <div class="alert-success-text">
                             <?php

diff --git a/Processes/DefaultViews/Error.php b/Processes/DefaultViews/Error.php
@@ -36,11 +36,15 @@
             <img src="<?= Out(SATURN_ROOT); ?>/Assets/Images/Saturn-logo.webp" class="w-1/4 mx-auto" alt="Logo">
 
             <div class="pb-8">
-                <h1 class="text-header">
-                    <?= __('Error'); ?> <?= Out($ErrorCode); ?>: <?= Out($ErrorName); ?>
+                <h1 class="text-header text-center">
+                    <?= __('Error'); ?> <?= Out($ErrorCode); ?>
                 </h1>
 
-                <p class="text-body">
+                <p class="text-subheader-nopt text-center"><?= Out($ErrorName); ?></p>
+
+                <br>
+
+                <p class="text-error">
                     <?= Out($ErrorDescription); ?>
                 </p>
             </div>

diff --git a/Processes/Saturn/AccountManager/Join.php b/Processes/Saturn/AccountManager/Join.php
@@ -26,18 +26,29 @@
         $Password = password_hash($_POST['password'], SECURITY_PASSWORD_ALGORITHM);
         $UniqID = $UUID->Generate();
 
-        $Result = $DB->Insert('user', '`id`, `uuid`, `username`, `email`, `password`', "NULL, '".$UniqID."', '".$Username."', '".$Email."', '".$Password."'");
-        $Result = $DB->Insert('user_permissions', '`id`, `uuid`', "NULL, '".$UniqID."'");
-        if ($DB->Error() == null) {
-            header('Location: /account?success=created');
-        } else {
+        try {
+            $Result = $DB->Insert('user', '`id`, `uuid`, `username`, `email`, `password`', "NULL, '" . $UniqID . "', '" . $Username . "', '" . $Email . "', '" . $Password . "'");
+            $Result = $DB->Insert('user_permissions', '`id`, `uuid`', "NULL, '" . $UniqID . "'");
+            if ($DB->Error() == null) {
+                header('Location: /account?success=created');
+            } else {
+                $EH = new ErrorHandler();
+                $EH->SaturnError(
+                    '500',
+                    $DB->Error(),
+                    'Database error',
+                    'There was a problem with the database query.',
+                    SATSYS_DOCS_URL . '/troubleshooting/errors/database#' . strtolower($DB->Error())
+                );
+            }
+        } catch (Exception $e) {
             $EH = new ErrorHandler();
             $EH->SaturnError(
                 '500',
-                $DB->Error(),
+                'DBMS-4',
                 'Database error',
-                'There was a problem with the database query.',
-                SATSYS_DOCS_URL.'/troubleshooting/errors/database#'.strtolower($DB->Error())
+                'There was a problem with the database query. '.$e->getMessage(),
+                SATSYS_DOCS_URL . '/troubleshooting/errors/database#' . strtolower($DB->Error())
             );
         }
     } else {

diff --git a/Processes/Saturn/DatabaseManager/DBMS.php b/Processes/Saturn/DatabaseManager/DBMS.php
@@ -60,7 +60,18 @@ public function Select(string $What, string $From, string|null $Where, string $A
 
     public function Query(string $Query)
     {
-        return $this->Database->Query($Query);
+        try {
+            return $this->Database->Query($Query);
+        } catch (\Exception $e) {
+            $err = new ErrorHandler();
+            $err->SaturnError(
+                '500',
+                'DBMS-4',
+                'An unexpected error occurred whilst executing the database query.',
+                $e->getMessage(),
+                SATSYS_DOCS_URL.'/troubleshooting/errors/database'
+            );
+        }
     }
 
     public function Insert(string $Into, string|null $Columns, string|null $Values): array|object|int|null

diff --git a/Processes/Start.php b/Processes/Start.php
@@ -16,14 +16,14 @@
 $Session = new Session();
 $Session->Start();
 
-register_shutdown_function('SaturnEnd');
-
 function SaturnEnd(): void
 {
     $Actions = new Actions();
     $Actions->Run('Saturn.End');
 }
 
+register_shutdown_function('SaturnEnd');
+
 // ACTIONS
 $ActionList = [];
 $Actions = new Actions();

diff --git a/index.php b/index.php
@@ -11,6 +11,6 @@
 //
 //                              SATURN CMS VERSION 1.0.0
 //                           PIXELSET -- APACHE LICENSE 2.0
-
+error_reporting(E_ALL);
 require_once __DIR__.'/Processes/Load.php';
 require_once __DIR__.'/Processes/Start.php';