From 4186a609ef1813bee4c49370daa453c00a5d64e2 Mon Sep 17 00:00:00 2001 From: Fluffy-Bean Date: Thu, 17 Nov 2022 10:57:18 +0000 Subject: [PATCH] Update AutoFix style --- app/sanity/fix/_database.php | 184 +++++++++++++++++++++++++++++------ app/sanity/fix/_folders.php | 180 +++++++++++++++++++++++++++------- app/sanity/sanity.php | 73 +++++++++----- 3 files changed, 348 insertions(+), 89 deletions(-) diff --git a/app/sanity/fix/_database.php b/app/sanity/fix/_database.php index 9d417a8..18396b8 100644 --- a/app/sanity/fix/_database.php +++ b/app/sanity/fix/_database.php @@ -15,10 +15,11 @@ if (defined('ROOT') && $_SESSION['id'] == 1) { } if (check_database($conn, 'images')) { - echo "

[INFO] Found images table

"; + $results[] = array( + 'type'=>'success', + 'message'=> 'Found images table', + ); } else { - echo "

[INFO] Could not find images table, creating test table...

"; - $sql = "CREATE TABLE IF NOT EXISTS images ( id INT(11) AUTO_INCREMENT PRIMARY KEY, imagename VARCHAR(255) NOT NULL UNIQUE, @@ -28,16 +29,35 @@ if (defined('ROOT') && $_SESSION['id'] == 1) { last_modified TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, upload_date TIMESTAMP DEFAULT CURRENT_TIMESTAMP )"; - if ($conn->query($sql) === TRUE) { - echo "

[INFO] Table images made!

"; + + try { + if ($conn->query($sql) === TRUE) { + $results[] = array( + 'type'=>'success', + 'message'=> 'Table images created!', + ); + } else { + $results[] = array( + 'type'=>'critical', + 'message'=> 'Error creating table images: '.$conn->error, + 'fix'=>'manual', + ); + } + } catch (Exception $e) { + $results[] = array( + 'type'=>'critical', + 'message'=> 'Error creating table images: '.$e, + 'fix'=>'manual', + ); } } if (check_database($conn, 'users')) { - echo "

[INFO] Found users table

"; + $results[] = array( + 'type'=>'success', + 'message'=> 'Found users table', + ); } else { - echo "

[INFO] Could not find users table, creating test table...

"; - $sql = "CREATE TABLE IF NOT EXISTS users ( id INT(11) AUTO_INCREMENT PRIMARY KEY, username VARCHAR(255) NOT NULL UNIQUE, @@ -47,16 +67,35 @@ if (defined('ROOT') && $_SESSION['id'] == 1) { last_modified TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP )"; - if ($conn->query($sql) === TRUE) { - echo "

[INFO] Table users made!

"; + + try { + if ($conn->query($sql) === TRUE) { + $results[] = array( + 'type'=>'success', + 'message'=> 'Table users created!', + ); + } else { + $results[] = array( + 'type'=>'critical', + 'message'=> 'Error creating table users: '.$conn->error, + 'fix'=>'manual', + ); + } + } catch (Exception $e) { + $results[] = array( + 'type'=>'critical', + 'message'=> 'Error creating table users: '.$e, + 'fix'=>'manual', + ); } } if (check_database($conn, 'groups')) { - echo "

[INFO] Found groups table

"; + $results[] = array( + 'type'=>'success', + 'message'=> 'Found groups table', + ); } else { - echo "

[INFO] Could not find groups table, creating test table...

"; - $sql = "CREATE TABLE IF NOT EXISTS groups ( id INT(11) AUTO_INCREMENT PRIMARY KEY, group_name VARCHAR(255) NOT NULL, @@ -64,32 +103,70 @@ if (defined('ROOT') && $_SESSION['id'] == 1) { last_modified TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP )"; - if ($conn->query($sql) === TRUE) { - echo "

[INFO] Table groups made!

"; + + try { + if ($conn->query($sql) === TRUE) { + $results[] = array( + 'type'=>'success', + 'message'=> 'Table groups created!', + ); + } else { + $results[] = array( + 'type'=>'critical', + 'message'=> 'Error creating table groups: '.$conn->error, + 'fix'=>'manual', + ); + } + } catch (Exception $e) { + $results[] = array( + 'type'=>'critical', + 'message'=> 'Error creating table groups: '.$e, + 'fix'=>'manual', + ); } } if (check_database($conn, 'logs')) { - echo "

[INFO] Found logs table

"; + $results[] = array( + 'type'=>'success', + 'message'=> 'Found logs table', + ); } else { - echo "

[INFO] Could not find logs table, creating test table...

"; - $sql = "CREATE TABLE IF NOT EXISTS logs ( id INT(11) AUTO_INCREMENT PRIMARY KEY, ipaddress VARCHAR(16) NOT NULL, action VARCHAR(255) NOT NULL, created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP )"; - if ($conn->query($sql) === TRUE) { - echo "

[INFO] Table logs made!

"; + + try { + if ($conn->query($sql) === TRUE) { + $results[] = array( + 'type'=>'success', + 'message'=> 'Table logs created!', + ); + } else { + $results[] = array( + 'type'=>'critical', + 'message'=> 'Error creating table logs: '.$conn->error, + 'fix'=>'manual', + ); + } + } catch (Exception $e) { + $results[] = array( + 'type'=>'critical', + 'message'=> 'Error creating table logs: '.$e, + 'fix'=>'manual', + ); } } if (check_database($conn, 'bans')) { - echo "

[INFO] Found bans table

"; + $results[] = array( + 'type'=>'success', + 'message'=> 'Found bans table', + ); } else { - echo "

[INFO] Could not find bans table, creating test table...

"; - $sql = "CREATE TABLE IF NOT EXISTS bans ( id INT(11) AUTO_INCREMENT PRIMARY KEY, ipaddress VARCHAR(16) NOT NULL, @@ -98,30 +175,73 @@ if (defined('ROOT') && $_SESSION['id'] == 1) { length VARCHAR(255) NOT NULL, permanent BOOLEAN NOT NULL DEFAULT FALSE )"; - if ($conn->query($sql) === TRUE) { - echo "

[INFO] Table bans made!

"; + + try { + if ($conn->query($sql) === TRUE) { + $results[] = array( + 'type'=>'success', + 'message'=> 'Table bans created!', + ); + } else { + $results[] = array( + 'type'=>'critical', + 'message'=> 'Error creating table bans: '.$conn->error, + 'fix'=>'manual', + ); + } + } catch (Exception $e) { + $results[] = array( + 'type'=>'critical', + 'message'=> 'Error creating table bans: '.$e, + 'fix'=>'manual', + ); } } if (check_database($conn, 'tokens')) { - echo "

[INFO] Found tokens table

"; + $results[] = array( + 'type'=>'success', + 'message'=> 'Found tokens table', + ); } else { - echo "

[INFO] Could not find tokens table, creating test table...

"; - $sql = "CREATE TABLE IF NOT EXISTS tokens ( id INT(11) AUTO_INCREMENT PRIMARY KEY, code VARCHAR(59) NOT NULL, used BOOLEAN NOT NULL DEFAULT FALSE, timestamp TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP )"; - if ($conn->query($sql) === TRUE) { - echo "

[INFO] Table tokens made!

"; + + try { + if ($conn->query($sql) === TRUE) { + $results[] = array( + 'type'=>'success', + 'message'=> 'Table tokens created!', + ); + } else { + $results[] = array( + 'type'=>'critical', + 'message'=> 'Error creating table tokens: '.$conn->error, + 'fix'=>'manual', + ); + } + } catch (Exception $e) { + $results[] = array( + 'type'=>'critical', + 'message'=> 'Error creating table tokens: '.$e, + 'fix'=>'manual', + ); } } if (check_database($conn, 'test')) { - echo "

[INFO] Found test table

"; + $results[] = array( + 'type'=>'success', + 'message'=> 'Found test table', + ); } else { - echo "

[ERRO] Could not find test table, creating test table...

"; + $results[] = array( + 'type'=>'critical', + 'message'=> 'Error creating table tokens: This is a test, you do not need to act on this', + ); } } \ No newline at end of file diff --git a/app/sanity/fix/_folders.php b/app/sanity/fix/_folders.php index d675df5..219e327 100644 --- a/app/sanity/fix/_folders.php +++ b/app/sanity/fix/_folders.php @@ -1,63 +1,175 @@ [INFO] Found usr/ folder!

"; + $results[] = array( + 'type'=>'success', + 'message'=> 'Found usr/ folder!', + ); } else { - echo "

[ERRO] usr/ folder not found

"; - echo "

[INFO] Creating usr/ folder...

"; - - mkdir("usr"); + try { + if (mkdir(__DIR__."/../../../usr")) { + $results[] = array( + 'type'=>'success', + 'message'=> 'Created usr/ folder!', + ); + } else { + $results[] = array( + 'type'=>'critical', + 'message'=> 'Error creating usr/ folder', + 'fix'=>'manual', + ); + } + } catch (Exception $e) { + $results[] = array( + 'type'=>'critical', + 'message'=> 'Error creating usr/ folder: '.$e, + 'fix'=>'manual', + ); + } } if (is_dir(__DIR__."/../../../usr/images")) { - echo "

[INFO] Found usr/images/ folder!

"; + $results[] = array( + 'type'=>'success', + 'message'=> 'Found usr/images/ folder!', + ); } else { - echo "

[ERRO] usr/images/ folder not found

"; - echo "

[INFO] Creating usr/images/ folder...

"; - - mkdir("usr/images"); - } - if (!is_dir(__DIR__."/../../../usr/images/thumbnails")) { - echo "

[ERRO] usr/images/thumbnails/ folder not found

"; - echo "

[INFO] Creating usr/images/thumbnails/ folder...

"; - - mkdir("usr/images/thumbnails"); - } - if (!is_dir(__DIR__."/../../../usr/images/previews")) { - echo "

[ERRO] usr/images/previews/ folder not found

"; - echo "

[INFO] Creating usr/images/previews/ folder...

"; - - mkdir("usr/images/previews"); + try { + if (mkdir(__DIR__."/../../../usr/images")) { + $results[] = array( + 'type'=>'success', + 'message'=> 'Created usr/images/ folder!', + ); + } else { + $results[] = array( + 'type'=>'critical', + 'message'=> 'Error creating usr/images/ folder', + 'fix'=>'manual', + ); + } + } catch (Exception $e) { + $results[] = array( + 'type'=>'critical', + 'message'=> 'Error creating usr/images/ folder: '.$e, + 'fix'=>'manual', + ); + } } - if (!is_dir(__DIR__."/../../../usr/conf")) { - echo "

[ERRO] usr/conf/ folder not found

"; - echo "

[INFO] Creating usr/conf/ folder...

"; + if (is_dir(__DIR__."/../../../usr/images/thumbnails")) { + $results[] = array( + 'type'=>'success', + 'message'=> 'Found usr/images/thumbnails/ folder!', + ); + } else { + try { + if (mkdir(__DIR__."/../../../usr/images/thumbnails")) { + $results[] = array( + 'type'=>'success', + 'message'=> 'Created usr/images/thumbnails/ folder!', + ); + } else { + $results[] = array( + 'type'=>'critical', + 'message'=> 'Error creating usr/images/thumbnails/ folder', + 'fix'=>'manual', + ); + } + } catch (Exception $e) { + $results[] = array( + 'type'=>'critical', + 'message'=> 'Error creating usr/images/thumbnails/ folder: '.$e, + 'fix'=>'manual', + ); + } + } + if (is_dir(__DIR__."/../../../usr/images/previews")) { + $results[] = array( + 'type'=>'success', + 'message'=> 'Found usr/images/previews/ folder!', + ); + } else { + try { + if (mkdir(__DIR__."/../../../usr/images/previews")) { + $results[] = array( + 'type'=>'success', + 'message'=> 'Created usr/images/previews/ folder!', + ); + } else { + $results[] = array( + 'type'=>'critical', + 'message'=> 'Error creating usr/images/previews/ folder', + 'fix'=>'manual', + ); + } + } catch (Exception $e) { + $results[] = array( + 'type'=>'critical', + 'message'=> 'Error creating usr/images/previews/ folder: '.$e, + 'fix'=>'manual', + ); + } + } - mkdir("usr/conf"); + if (is_dir(__DIR__."/../../../usr/conf")) { + $results[] = array( + 'type'=>'success', + 'message'=> 'Found usr/conf/ folder!', + ); + } else { + try { + if (mkdir(__DIR__."/../../../usr/conf")) { + $results[] = array( + 'type'=>'success', + 'message'=> 'Created usr/conf/ folder!', + ); + } else { + $results[] = array( + 'type'=>'critical', + 'message'=> 'Error creating usr/conf/ folder', + 'fix'=>'manual', + ); + } + } catch (Exception $e) { + $results[] = array( + 'type'=>'critical', + 'message'=> 'Error creating usr/conf/ folder: '.$e, + 'fix'=>'manual', + ); + } } if (is_file(__DIR__."/../../../usr/conf/conf.json")) { - echo "

[INFO] Found usr/conf/conf.json file!

"; + $results[] = array( + 'type'=>'success', + 'message'=> 'Found usr/conf/conf.json folder!', + ); } else { - echo "

[ERRO] usr/conf/conf.json file not found

"; - echo "

[INFO] Creating usr/conf/conf.json file...

"; - try { $conf = file_get_contents(__DIR__."/../../../usr/conf.default.json"); - $conf_new = fopen(__DIR__."/../../../usr/conf/conf.json", "w"); if ($conf_new) { fwrite($conf_new, $conf); fclose($conf_new); - echo "

[INFO] usr/conf/conf.json file created!

"; + $results[] = array( + 'type'=>'success', + 'message'=> 'Created usr/conf/conf.json file!', + ); } else { - echo "

[ERRO] Failed to create usr/conf/conf.json file

"; + $results[] = array( + 'type'=>'critical', + 'message'=> 'Error creating usr/conf/conf.json file!', + 'fix'=>'manual', + ); } } catch (Exception $e) { - echo "

[ERRO] Could not read usr/conf.default.json file

"; + $results[] = array( + 'type'=>'critical', + 'message'=> 'Error creating usr/conf/conf.json file: '.$e, + 'fix'=>'manual', + ); } } } \ No newline at end of file diff --git a/app/sanity/sanity.php b/app/sanity/sanity.php index acd1036..b9f01c4 100644 --- a/app/sanity/sanity.php +++ b/app/sanity/sanity.php @@ -4,37 +4,60 @@ session_start(); require_once "../conn.php"; if (isset($_POST['fix'])) { - $timer_start = microtime(true); - - echo "

[INFO] Starting autofix

"; - if (empty($_SESSION['id'])) { echo "

You are not logged in

"; exit(); } elseif ($_SESSION['id'] != 1) { - echo "

Autofix is currently not avaliable to You.

"; + echo "

Autofix is currently not avaliable to You. Sowwy!

"; exit(); } - define('ROOT', true); // Only run scripts from this file - - echo "

==== Databases ====

"; - require_once "fix/_database.php"; + $timer_start = microtime(true); - echo "

==== Folders ====

"; + $results = array(); // Array to store results + define('ROOT', true); // Only run scripts from this file + + require_once "fix/_database.php"; require_once "fix/_folders.php"; + foreach ($results as $result) { + if (isset($result['type'])) { + if ($result['type'] == 'critical') { + echo "

Critical "; + } elseif ($result['type'] == 'warning') { + echo "

Warning "; + } elseif ($result['type'] == 'success') { + echo "

Success "; + } + } + + if (isset($result['fix'])) { + if ($result['fix'] == 'auto') { + echo "Auto fix available "; + $autofix_enable = true; + } elseif ($result['fix'] == 'manual') { + echo "Manual fix required "; + } + } + + if (isset($result['link'])) { + echo "Recources "; + } + + echo $result['message']."

"; + } + $timer_end = microtime(true); $timer_diff = ($timer_end - $timer_start); $timer_diff = round($timer_diff, 6) * 1000; - echo "

[INFO] Autofix complete in $timer_diff ms

"; + echo "

Autofix complete in $timer_diff ms

"; } elseif (isset($_POST['check'])) { if (empty($_SESSION['id'])) { echo "

You are not logged in

"; exit(); } elseif ($_SESSION['id'] != 1) { - echo "

Autofix is currently not avaliable to You.

"; + echo "

Scan is currently not avaliable to You. Sowwy!

"; exit(); } @@ -54,19 +77,23 @@ if (isset($_POST['fix'])) { echo "

No errors! Lookin' good :3

"; } else { foreach ($results as $result) { - if ($result['type'] == 'critical') { - echo "

Critical "; - } elseif ($result['type'] == 'warning') { - echo "

Warning "; - } elseif ($result['type'] == 'success') { - echo "

Success "; + if (isset($result['type'])) { + if ($result['type'] == 'critical') { + echo "

Critical "; + } elseif ($result['type'] == 'warning') { + echo "

Warning "; + } elseif ($result['type'] == 'success') { + echo "

Success "; + } } - if ($result['fix'] == 'auto') { - echo "Auto fix available "; - $autofix_enable = true; - } elseif ($result['fix'] == 'manual') { - echo "Manual fix required "; + if (isset($result['fix'])) { + if ($result['fix'] == 'auto') { + echo "Auto fix available "; + $autofix_enable = true; + } elseif ($result['fix'] == 'manual') { + echo "Manual fix required "; + } } if (isset($result['link'])) {