diff --git a/.htaccess b/.htaccess index 27b7ab0..02cd4d8 100644 --- a/.htaccess +++ b/.htaccess @@ -1,7 +1,6 @@ RewriteEngine On RewriteRule ^$ main [QSA] RewriteRule ^index\.php$ wiki.php?page=main [QSA] - RewriteRule ^users$ includes/users.php [QSA,L] 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/articles/userdir.md b/articles/users.md similarity index 100% rename from articles/userdir.md rename to articles/users.md diff --git a/includes/users.php b/includes/users.php index 71da3a8..d1f413d 100644 --- a/includes/users.php +++ b/includes/users.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/userdir.md"); -$footer = file_get_contents("$doc_root/includes/footer.md"); - -print " - - - $site_name - $page - - - - - - - -"; - -print "
-
- - - - - - -
"; - -echo $ParsedownExtra->text($content); - print ""; print "
"; - -print "
- - - - - - - - - -"; ?> diff --git a/wiki.php b/wiki.php index 8f14721..c163535 100644 --- a/wiki.php +++ b/wiki.php @@ -63,6 +63,12 @@ print " echo $ParsedownExtra->text($content); +switch ($page) +{ + case 'users': + require "includes/$page.php"; +} + print "