thunix
/
www
4
1
Fork 6
Code Issues 2 Pull Requests Releases Wiki Activity

Let wiki.php render users.php

This commit is contained in:
Blade of Darkness 2021-01-12 21:42:55 +01:00
parent 48922db7c4
commit a6ae512417
4 changed files with 6 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.htaccess
View File

@ -1,7 +1,6 @@
RewriteEngine On RewriteEngine On
RewriteRule ^$ main [QSA] RewriteRule ^$ main [QSA]
RewriteRule ^index\.php$ wiki.php?page=main [QSA] RewriteRule ^index\.php$ wiki.php?page=main [QSA]
RewriteRule ^users$ includes/users.php [QSA,L]
RewriteRule ^server$ includes/server.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) RewriteCond %{REQUEST_URI} !(/includes/|/media/|tilde.json|humans.txt|/webmail/|/favicon.ico|/~|githook|sitemap.xml)
RewriteRule ^([^\d]+)/?$ wiki.php?page=$1 [QSA] RewriteRule ^([^\d]+)/?$ wiki.php?page=$1 [QSA]

0
articles/userdir.md → articles/users.md
View File

82
includes/users.php
View File

@ -1,68 +1,4 @@
<?php <?php
/*
This code is licensed under the AGPL 3 or later by ubergeek (https://tildegit.org/ubergeek)
Parsedown and Parsedown Extra is licensed under the MIT license.
*/
include('../config.php');
include('../parsedown-1.7.3/Parsedown.php');
include('../parsedown-extra-0.7.1/ParsedownExtra.php');
if(isset($_GET['page']))
$page = $_GET['page'];
else
$page = "users";
if(isset($_GET['style']))
$site_style = $_GET['style'];
$Parsedown = new Parsedown();
$Parsedown->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 "<!DOCTYPE html>
<html lang='en'>
<head>
<title>$site_name - $page</title>
<link rel='stylesheet' type='text/css' href='$site_root/includes/$site_style.css'>
</head>
<body>
<!-- Begin Header -->
<div id='header'>";
print $Parsedown->text($header);
print "
</div>
<!-- End Header -->
";
print "<hr>
<div id='body'>
<!-- Begin Sidebar -->
<div id='sidebar'>
";
echo $Parsedown->text($sidebar);
print " </div>
<!-- End Sidebar -->
<!-- Begin Body -->
<div id='content'>";
echo $ParsedownExtra->text($content);
print "<!-- Begin autogen userdir list -->"; print "<!-- Begin autogen userdir list -->";
print "<ul style='list-style: none; margin-left: -40px;'>"; print "<ul style='list-style: none; margin-left: -40px;'>";
foreach (glob("/home/*") as $user): foreach (glob("/home/*") as $user):
@ -73,22 +9,4 @@ foreach (glob("/home/*") as $user):
endforeach; endforeach;
print "</ul></div> print "</ul></div>
<!-- End Autgen userdir list -->"; <!-- End Autgen userdir list -->";
print " </div>
<!-- End Body -->
</div>
<!-- Begin Footer -->
<div id='footer'>
<hr>
";
echo $Parsedown->text($footer);
print " </div>
<!-- End Footer -->
</body>
</html>";
?> ?>

6
wiki.php
View File

@ -63,6 +63,12 @@ print " </div>
echo $ParsedownExtra->text($content); echo $ParsedownExtra->text($content);
switch ($page)
{
case 'users':
require "includes/$page.php";
}
print " </div> print " </div>
<!-- End Body --> <!-- End Body -->