diff options
| -rw-r--r-- | admin/index.php | 44 | ||||
| -rw-r--r-- | includes/Parsedown.php | 10 | ||||
| -rw-r--r-- | includes/gui/header.php | 2 | ||||
| -rw-r--r-- | social/index.php | 24 |
4 files changed, 68 insertions, 12 deletions
diff --git a/admin/index.php b/admin/index.php index 0b03f35..f45cd62 100644 --- a/admin/index.php +++ b/admin/index.php @@ -4,10 +4,27 @@ <br> <div class="container"> <h1>Welcome back <?= $_USER ?>!</h1> - <br> <div class="row"> - <div class="col"> + <div class="col-lg-4"> + <div class="card"> + <div class="card-body"> + <h4 class="card-title">General</h4> + <p class="card-text">General website configuration data.</p> + <a href="/admin/general" class="btn btn-primary disabled">Manage</a> + </div> + </div> + </div> + <div class="col-lg-4"> + <div class="card"> + <div class="card-body"> + <h4 class="card-title">File Uploader</h4> + <p class="card-text">Encrypted, secure and fast file uploader.</p> + <a href="/admin/uploads" class="btn btn-primary disabled">Manage</a> + </div> + </div> + </div> + <div class="col-lg-4"> <div class="card"> <div class="card-body"> <h4 class="card-title">PluralKit</h4> @@ -16,7 +33,7 @@ </div> </div> </div> - <div class="col"> + <div class="col-lg-4"> <div class="card"> <div class="card-body"> <h4 class="card-title">Projects</h4> @@ -25,7 +42,7 @@ </div> </div> </div> - <div class="col"> + <div class="col-lg-4"> <div class="card"> <div class="card-body"> <h4 class="card-title">Contact Info</h4> @@ -34,12 +51,27 @@ </div> </div> </div> + <div class="col-lg-4"> + <div class="card"> + <div class="card-body"> + <h4 class="card-title">Software Updates</h4> + <p class="card-text">Ensure this version of the website is up-to-date.</p> + <a href="/admin/updates" class="btn btn-primary disabled">Manage</a> + </div> + </div> + </div> </div> - <br> - <p>This website is managed by <?php $admins = json_decode(file_get_contents($_SERVER["DOCUMENT_ROOT"] . "/data/admins.json"), true); foreach ($admins as $index => $item): ?><b><?= $item ?></b><?php if ($item === $_USER): ?> (you)<?php endif; ?><?php if ($index !== count($admins) - 1): ?><?php if ($index + 1 === count($admins) - 1): ?> and <?php else: ?>, <?php endif; ?><?php endif; ?><?php endforeach; ?>, <a href="/admin/users">edit...</a></p> + <p>This website is managed by <?php $admins = json_decode(file_get_contents($_SERVER["DOCUMENT_ROOT"] . "/data/admins.json"), true); foreach ($admins as $index => $item): ?><b><?= $item ?></b><?php if ($item === $_USER): ?> (you)<?php endif; ?><?php if ($index !== count($admins) - 1): ?><?php if ($index + 1 === count($admins) - 1): ?> and <?php else: ?>, <?php endif; ?><?php endif; ?><?php endforeach; ?> (<a href="/admin/users">edit...</a>) and updated through <a href="https://ci.minteck.org/project/CloudburstSystemSWebsite?mode=builds" target="_blank">Minteck's TeamCity instance</a></p> <p class="small text-muted">powered by Pawer Technologies</p> </div> +<style> + .col-lg-4 { + padding-top: calc(var(--bs-gutter-x) * .5); + padding-bottom: calc(var(--bs-gutter-x) * .5); + } +</style> + <?php require_once $_SERVER["DOCUMENT_ROOT"] . "/includes/admin/footer.php"; ?>
\ No newline at end of file diff --git a/includes/Parsedown.php b/includes/Parsedown.php index 1b9d6d5..88c0b72 100644 --- a/includes/Parsedown.php +++ b/includes/Parsedown.php @@ -17,7 +17,7 @@ class Parsedown { # ~ - const version = '1.7.4'; + const version = '1.7.4.ProjectCloudsdale'; # ~ @@ -794,7 +794,7 @@ class Parsedown $Block['depth'] ++; } - if (preg_match('/(.*?)<\/'.$Block['name'].'>[ ]*$/i', $Line['text'], $matches)) # close + if (preg_match('/(.*?)<\/'.$Block['name'].'>[ ]*$/i', $Line['text'])) # close { if ($Block['depth'] > 0) { @@ -823,7 +823,7 @@ class Parsedown protected function blockReference($Line) { - if (preg_match('/^\[(.+?)\]:[ ]*<?(\S+?)>?(?:[ ]+["\'(](.+)["\')])?[ ]*$/', $Line['text'], $matches)) + if (preg_match('/^\[(.+?)]:[ ]*<?(\S+?)>?(?:[ ]+["\'(](.+)["\')])?[ ]*$/', $Line['text'], $matches)) { $id = strtolower($matches[1]); @@ -1272,7 +1272,7 @@ class Parsedown $remainder = $Excerpt['text']; - if (preg_match('/\[((?:[^][]++|(?R))*+)\]/', $remainder, $matches)) + if (preg_match('/\[((?:[^][]++|(?R))*+)]/', $remainder, $matches)) { $Element['text'] = $matches[1]; @@ -1298,7 +1298,7 @@ class Parsedown } else { - if (preg_match('/^\s*\[(.*?)\]/', $remainder, $matches)) + if (preg_match('/^\s*\[(.*?)]/', $remainder, $matches)) { $definition = strlen($matches[1]) ? $matches[1] : $Element['text']; $definition = strtolower($definition); diff --git a/includes/gui/header.php b/includes/gui/header.php index dff6b67..5f5bc25 100644 --- a/includes/gui/header.php +++ b/includes/gui/header.php @@ -1,6 +1,6 @@ <?php -if ($_SERVER['HTTP_HOST'] !== "conep.one" && $_SERVER['HTTP_HOST'] !== "www.conep.one") { +if ($_SERVER['HTTP_HOST'] !== "conep.one" && $_SERVER['HTTP_HOST'] !== "www.conep.one" && $_SERVER['HTTP_HOST'] !== "localhost" && $_SERVER['HTTP_HOST'] !== "0.0.0.0") { header("Location: https://" . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']); die(); } diff --git a/social/index.php b/social/index.php new file mode 100644 index 0000000..a66765f --- /dev/null +++ b/social/index.php @@ -0,0 +1,24 @@ +<?php $title = "Social"; require_once $_SERVER["DOCUMENT_ROOT"] . "/includes/gui/header.php"; ?> + +<div class="container"> + <br> + <h1>Social</h1> + <br> + + <div class="row"> + <?php foreach (json_decode(file_get_contents($_SERVER["DOCUMENT_ROOT"] . "/data/contact.json"), true) as $project): ?> + <div class="col-lg-4"> + <div class="card stylized-card"> + <div class="card-body"> + <img class="stylized-card-icon" src="<?= $project["icon"] ?>" alt=""> + <h4 class="card-title"><?= $project["name"] ?></h4> + <p class="card-text"><?= $project["link"] ?></p> + <a href="<?= $project["link"] ?>" target="_blank" class="btn btn-outline-light">View More</a> + </div> + </div> + </div> + <?php endforeach; ?> + </div> +</div> + +<?php require_once $_SERVER["DOCUMENT_ROOT"] . "/includes/gui/footer.php"; ?>
\ No newline at end of file |