[INFO] Starting autofix
"; @@ -20,14 +15,6 @@ if (isset($_POST['autofix'])) { echo "[ERRO] You cannot use Autofix as an Admin currently.
"; exit(); } - - $check_sanity = $sanity->get_results(); - if (empty($check_sanity)) { - echo "[INFO] Sanity check passed. No errors found.
"; - exit(); - } else { - echo "[WARN] Sanity check failed, continuing...
"; - } define('ROOT', true); // Only run scripts from this file @@ -42,4 +29,236 @@ if (isset($_POST['autofix'])) { $autofix_time = round($autofix_time, 6) * 1000; echo "[INFO] Autofix complete in $autofix_time ms
"; +} + +if (isset($_POST['check'])) { + function check_json(): array + { + $results = array(); + + if (!is_file(__DIR__."/../../usr/conf/msg.json")) { + $results[] = array( + 'type'=>'warning', + 'message'=>'msg.json is missing', + 'fix'=>'auto' + ); + } + + if (!is_file(__DIR__."/../../usr/conf/conf.json")) { + if (is_file(__DIR__."/../../usr/conf/manifest.json")) { + $results[] = array( + 'type'=>'critical', + 'message'=>'manifest.json is deprecated, please rename it to conf.json', + 'fix'=>'manual' + ); + } else { + $results[] = array( + 'type'=>'critical', + 'message'=>'conf.json is missing, using conf.default.json instead', + 'fix'=>'auto' + ); + } + } else { + $manifest = json_decode(file_get_contents(__DIR__."/../../usr/conf/conf.json"), true); + + if (empty($manifest['user_name']) || $manifest['user_name'] == "[your name]") { + $results[] = array( + 'type'=>'warning', + 'message'=>'conf.json is missing your name', + 'fix'=>'manual' + ); + } + if ($manifest['upload']['rename_on_upload']) { + if (empty($manifest['upload']['rename_to'])) { + $results[] = array( + 'type'=>'critical', + 'message'=>'conf.json doesnt know what to rename your files to', + 'fix'=>'manual' + ); + } else { + $rename_to = $manifest['upload']['rename_to']; + $rename_rate = 0; + + if (str_contains($rename_to, '{{autoinc}}')) $rename_rate = 5; + if (str_contains($rename_to, '{{time}}')) $rename_rate = 5; + + if (str_contains($rename_to, '{{date}}')) $rename_rate += 2; + if (str_contains($rename_to, '{{filename}}')) $rename_rate += 2; + + if (str_contains($rename_to, '{{username}}') || str_contains($rename_to, '{{userid}}')) $rename_rate += 1; + + if ($rename_rate < 2) { + $results[] = array( + 'type'=>'critical', + 'message'=>'You will encounter errors when uploading images due to filenames, update your conf.json', + 'fix'=>'manual' + ); + } elseif ($rename_rate < 5 && $rename_rate > 2) { + $results[] = array( + 'type'=>'warning', + 'message'=>'You may encounter errors when uploading images due to filenames, concider modifying your conf.json', + 'fix'=>'manual' + ); + } + } + } + + if ($manifest['is_testing']) { + $results[] = array( + 'type'=>'warning', + 'message'=>'You are currently in testing mode, errors will be displayed to the user. This is not recommended for production use.' + ); + } + } + + return $results; + } + + function check_dir(): array + { + $results = array(); + + $files = array( + 'usr/images', + 'usr/images/pfp', + 'usr/images/previews', + 'usr/images/thumbnails' + ); + + foreach ($files as $file) { + if (!is_dir(__DIR__."/../../$file")) { + $results[] = array( + 'type'=>'critical', + 'message'=>"$file is missing", + 'fix'=>'auto' + ); + } + } + + return $results; + } + + function check_version(): array + { + $results = array(); + + // Local app info + $app_local = json_decode(file_get_contents(__DIR__."/../gallery.json"), true); + + // Repo app info + $curl_url = "https://raw.githubusercontent.com/Fluffy-Bean/image-gallery/".$app_local['branch']."/app/settings/manifest.json"; + $curl = curl_init(); + curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); + curl_setopt($curl, CURLOPT_URL, $curl_url); + $result = curl_exec($curl); + curl_close($curl); + + $app_repo = json_decode($result, true); + + if ($app_local['version'] < $app_repo['version']) { + $results[] = array( + 'type'=>'critical', + 'message'=>'You are not running the latest version of the app v'.$app_repo['version'], + 'link'=>'https://github.com/Fluffy-Bean/image-gallery', + 'fix'=>'manual' + ); + } elseif ($app_local['version'] > $app_repo['version']) { + $results[] = array( + 'type'=>'critical', + 'message'=>'You are running a version of the app that is newer than the latest release v'.$app_repo['version'], + 'link'=>'https://github.com/Fluffy-Bean/image-gallery', + 'fix'=>'manual' + ); + } + + if (PHP_VERSION_ID < 80000) { + $results[] = array( + 'type'=>'warning', + 'message'=>'Your current version of PHP is '.PHP_VERSION.' The reccomended version is 8.0.0 or higher', + 'link'=>'https://www.php.net/downloads.php', + 'fix'=>'manual' + ); + } + + return $results; + } + + function check_permissions(): array + { + $results = array(); + + $files = array( + 'usr/images', + 'usr/images/pfp', + 'usr/images/previews', + 'usr/images/thumbnails', + 'usr/conf/conf.json', + 'usr/conf/msg.json', + 'usr/conf.default.json' + ); + + foreach ($files as $file) { + if (!is_writable(__DIR__."/../../$file")) { + $results[] = array( + 'type'=>'critical', + 'message'=>"$file is not writable", + 'fix'=>'manual' + ); + } + } + + foreach ($files as $file) { + if (!fileperms(__DIR__."/../../$file")) { + $results[] = array( + 'type'=>'critical', + 'message'=>"PHP does not have permitions for $file", + 'fix'=>'manual' + ); + } + } + + return $results; + } + + if ($_SESSION['id'] == 1) { + $results = array(); + + foreach (check_json() as $result) $results[] = $result; + foreach (check_dir() as $result) $results[] = $result; + foreach (check_permissions() as $result) $results[] = $result; + foreach (check_version() as $result) $results[] = $result; + + if (empty($results)) { + echo "No errors! Lookin' good :3
"; + } else { + foreach ($results as $result) { + if ($result['type'] == 'critical') { + echo "Critical "; + } else { + echo "
Warning "; + } + + 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']."
"; + } + + if ($autofix_enable) { + echo ""; + } + } + } else { + echo "You do not have permission todo this action!!!!!
"; + } } \ No newline at end of file diff --git a/assets/icons/circle-notch.svg b/assets/icons/circle-notch.svg new file mode 100644 index 0000000..ef5935d --- /dev/null +++ b/assets/icons/circle-notch.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/ui/header.php b/assets/ui/header.php index e99dd45..00cc78c 100644 --- a/assets/ui/header.php +++ b/assets/ui/header.php @@ -33,6 +33,9 @@ + + + @@ -51,4 +54,4 @@ - + \ No newline at end of file diff --git a/css/main.css b/css/main.css index 162793f..eb42998 100644 --- a/css/main.css +++ b/css/main.css @@ -960,50 +960,20 @@ nav .btn { content: ""; } -#autofix { +#sanityCheck { padding: 0; - display: none; - background-color: #121212; - position: relative; - border-radius: 3px; -} -#autofix button { - padding: 0.25rem; - width: 1.5rem; - height: 1.5rem; - position: absolute; - top: 0.25rem; - right: 0.25rem; - display: block; - box-sizing: border-box; - border: none; - border-radius: 3px; - transition: outline 0.1s cubic-bezier(0.19, 1, 0.22, 1); - background-color: rgba(21, 21, 21, 0.7333333333); - z-index: 2; -} -#autofix button img { - width: 1rem; - display: block; -} -#autofix button:hover { - outline: #E8E3E3 0.2rem solid; - color: #E8E3E3; - cursor: pointer; -} - -#autofix-log { - padding: 0.5rem 0.5rem 0 0.5rem; display: flex; flex-direction: column; - border-radius: 3px; + opacity: 0; + transform: scale(0.8); + transition: all 0.3s cubic-bezier(0.19, 1, 0.22, 1); } -#autofix-log > * { - font-family: "JetBrains Mono", monospace; - font-size: 0.9rem; - line-height: 1.1rem; +#sanityCheck > * { margin: 0 0 0.5rem 0; } +#sanityCheck > *:last-child { + margin: 0; +} /* |------------------------------------------------------------- @@ -1269,6 +1239,28 @@ textarea { border-radius: 3px; } +.loading { + -webkit-animation: spin 1.5s ease-in-out infinite; + animation: spin 1.5s ease-in-out infinite; +} + +@-webkit-keyframes spin { + 0% { + transform: rotate(0deg); + } + 100% { + transform: rotate(360deg); + } +} + +@keyframes spin { + 0% { + transform: rotate(0deg); + } + 100% { + transform: rotate(360deg); + } +} /* |------------------------------------------------------------- | BR / BREAK diff --git a/css/main.scss b/css/main.scss index 8989904..422f187 100644 --- a/css/main.scss +++ b/css/main.scss @@ -298,6 +298,19 @@ textarea { } } +.loading { + animation: spin 1.5s ease-in-out infinite; +} + +@keyframes spin { + 0% { + transform: rotate(0deg); + } + 100% { + transform: rotate(360deg); + } +} + /* |------------------------------------------------------------- | BR / BREAK diff --git a/css/scss/_body.scss b/css/scss/_body.scss index 329b386..d324de2 100644 --- a/css/scss/_body.scss +++ b/css/scss/_body.scss @@ -994,79 +994,22 @@ } } -#autofix { +#sanityCheck { padding: 0; - display: none; + display: flex; + flex-direction: column; - //border-left: $border; - - background-color: #121212; + opacity: 0; + transform: scale(0.8); - position: relative; - - @if calc($rad - 0.5rem) > 0 { - border-radius: calc($rad - 0.5rem); - } @else { - border-radius: 3px; - } - - button { - padding: 0.25rem; - - width: 1.5rem; height: 1.5rem; - - position: absolute; - top: 0.25rem; - right: 0.25rem; - - display: block; - box-sizing: border-box; - - border: none; - @if calc($rad - 0.5rem) > 0 { - border-radius: calc($rad - 0.5rem); - } @else { - border-radius: 3px; - } - - transition: outline 0.1s cubic-bezier(.19, 1, .22, 1); - - background-color: $bg-alt; - - z-index: +2; - - img { - width: 1rem; - - display: block; - } - - &:hover { - outline: $white 0.2rem solid; - color: $fg; - - cursor: pointer; - } - } -} - -#autofix-log { - padding: 0.5rem 0.5rem 0 0.5rem; - - display: flex; flex-direction: column; - - @if calc($rad - 0.5rem) > 0 { - border-radius: calc($rad - 0.5rem); - } @else { - border-radius: 3px; - } + transition: all 0.3s cubic-bezier(.19, 1, .22, 1); > * { - font-family: $font-code; - font-size: 0.9rem; - line-height: 1.1rem; - margin: 0 0 0.5rem 0; } + + & > *:last-child { + margin: 0; + } } \ No newline at end of file diff --git a/index.php b/index.php index 3f3f0aa..3964836 100644 --- a/index.php +++ b/index.php @@ -5,7 +5,6 @@ use App\Sanity; $user_info = new Account(); - $sanity = new Sanity(); ?> @@ -41,17 +40,6 @@ is_admin($conn, $_SESSION['id'])) { - $check_sanity = $sanity->get_results(); - if (!empty($check_sanity)) { - ?> - -