From 1b9c4e87af29822e60ab8de0730182bc33c60c33 Mon Sep 17 00:00:00 2001 From: Naglfar Date: Tue, 12 Jan 2021 22:00:42 +0100 Subject: [PATCH] Let wiki.php render server.php --- .htaccess | 1 - includes/server.php | 81 --------------------------------------------- wiki.php | 1 + 3 files changed, 1 insertion(+), 82 deletions(-) diff --git a/.htaccess b/.htaccess index 02cd4d8..86582bf 100644 --- a/.htaccess +++ b/.htaccess @@ -1,6 +1,5 @@ RewriteEngine On RewriteRule ^$ main [QSA] RewriteRule ^index\.php$ wiki.php?page=main [QSA] - RewriteRule ^server$ includes/server.php [QSA,L] RewriteCond %{REQUEST_URI} !(/includes/|/media/|tilde.json|humans.txt|/webmail/|/favicon.ico|/~|githook|sitemap.xml) RewriteRule ^([^\d]+)/?$ wiki.php?page=$1 [QSA] diff --git a/includes/server.php b/includes/server.php index 3f73260..1437a22 100644 --- a/includes/server.php +++ b/includes/server.php @@ -1,68 +1,4 @@ setMarkupEscaped(true); -$ParsedownExtra = new ParsedownExtra(); - -if (empty($site_style)) - $site_style="site"; - -$header = file_get_contents("$doc_root/includes/header.md"); -$sidebar = file_get_contents("$doc_root/includes/sidebar.md"); -$content = file_get_contents("$doc_root/articles/server.md"); -$footer = file_get_contents("$doc_root/includes/footer.md"); - -print " - - - $site_name - $page - - - - - - - -"; - -print "
-
- - - - - - -
"; - -echo $ParsedownExtra->text($content); - // Monitoring section $hosts="all"; @@ -109,21 +45,4 @@ echo "\n\n"; fclose($f); // End monitoring section -print "
- - -
- - - - - - -"; ?> diff --git a/wiki.php b/wiki.php index c163535..5dcf93c 100644 --- a/wiki.php +++ b/wiki.php @@ -66,6 +66,7 @@ echo $ParsedownExtra->text($content); switch ($page) { case 'users': + case 'server': require "includes/$page.php"; }