fixed a syntax error smh

package.json

@@ -9,7 +9,9 @@
     "ejs": "^3.1.10",
     "express": "^5.2.1",
     "express-router": "^0.0.1",
+    "highlight.js": "^11.11.1",
     "markdown-it": "^14.1.0",
+    "markdown-it-named-code-blocks": "^1.1.0",
     "mssql": "^12.2.0",
     "package.json": "^2.0.1"
   }

src/data.js

@@ -14,7 +14,7 @@ export function increment_hitcount(postID = -1) { // -1 Means it will increment
 		writedata('hitcount', hitcount);
 	}
 	else {
-		let post = getdata('posts','id', postID);
+		let post = getdata('posts','id', postID)[0];
 		if (post == 1) // Does not exist
 		{
 			return 1
@@ -86,18 +86,19 @@ export function getdata(table_name, key=-1, value=-1) {
 						{ // id is the index
  							if (value < result.length && value >= 0)
 							{
-								return result[value]
+								return [result[value]]
 							}
 							else 
 							{
-								console.log("No object of this ID exists for the selected table")
+								console.log("No object of this ID exists for the selected table", table_name)
 								return 1
 							}
 						}
-						return result[func.find_key_value_pair(result, key, value)]
-						return -1 // This index doesn't exist
+						let return_value = func.find_key_value_pair(result, key, value)
+						return return_value
 					}
-					return result.slice(- config['data_request_limit'])
+					let return_value = result.slice(- config['data_request_limit'])
+					return return_value
 					break;
 				case 'hitcount':
 					result = func.require_module('../data/data.json') // This file is actually called data.json

src/functions.js

@@ -127,6 +127,8 @@ export function render_comment(comment_content)
 export function render_md(content)
 {
 	const markdownit = require("markdown-it")
+	const hljs = require("highlight.js");
+	const namedCodeBlocks = require("markdown-it-named-code-blocks");
 	const md = markdownit
 	({ // this is just defining some options for markdown-it, should I add this to config.json?
 		html: false,
@@ -135,11 +137,26 @@ export function render_md(content)
 		linkify: false,
 		typographer: true,
 		quotes: locale.quotes,
+		highlight: function (content, lang) {
+			if (lang && hljs.getLanguage(lang)) {
+				return (
+					'<pre class="hljs"><code>' +
+					hljs.highlight(content, { language: lang, ignoreIllegals: true }).value +
+					"</code></pre>"
+				);
+			}
+
+			return (
+				'<pre class="hljs"><code>' + md.utils.escapeHtml(content) + "</code></pre>"
+			);
+		}
 	})
+	.use(namedCodeBlocks)
 	.disable('image');
 	return md.render(content)
 };
 
+/*
 export function find_key_value_pair(data_array, key, value) {
 	for (let i = 0; i < data_array.length; i++) {
 		if (data_array[i][key] == value) {
@@ -148,3 +165,18 @@ export function find_key_value_pair(data_array, key, value) {
 	}
 	return -1
 };
+*/
+
+// Returns a list of matches
+export function find_key_value_pair(data_array, key, value) {
+	let return_list = []
+	for (let i = 0; i < data_array.length; i++) {
+		let element = data_array[i][key]
+		if (element == value
+		|| (Array.isArray(element) && element.includes(value))) {
+			return_list.push(data_array[i])
+		}
+	}
+	return return_list
+};
+

src/routes/form_actions.js

@@ -71,7 +71,7 @@ router.post(`${config.site_path}/submit_post`, (req,res) => {
 		fs.writeFileSync(`../data/posts.json`, `${JSON.stringify(posts)}`, 'utf-8');
 		comments.push({'id': id, 'comments': []})
 		fs.writeFileSync(`../data/comments.json`, `${JSON.stringify(comments)}`)
-		res.redirect(302, config.site_path);
+		res.redirect(302, `${config.sitr_path}/post/${id}`);
 	}
 	else {
 		res.render("partials/message", {

src/routes/forms.js

@@ -5,12 +5,15 @@ const func = require('../functions')
 const router = express.Router();
 
 ///////////////////// Form pages ////////////////////////////
+// new post
 router.get(`${config.site_path}/${config.new_post_url}`, (req,res) => {
 	res.render("forms/new_post", {
 		config,
 		locale,
 	});
 }); // /post
+
+// signup
 router.get(`${config.site_path}/${config.signup_url}`, (req,res) => {
 	// if the server does allow signup
 	if (config.allow_signup == true) {
@@ -29,24 +32,28 @@ router.get(`${config.site_path}/${config.signup_url}`, (req,res) => {
 	}
 	// If allow_signup is undefined or not a boolean, error
 	else {
-		res.redirect(301,"/")
+		res.redirect(301,config.site_path)
 		console.log("Error, invalid value for allow_signup (bool)")
 	}
 }); // /signup
+
+// edit account
 router.get(`${config.site_path}/${config.edit_account_base_url}/:user_id`, (req,res) => {
 	const userID = parseInt(req.params.user_id);
 	res.render("forms/edit_account",
 	{
 		config,
 		locale,
-		user: data.getdata('users', 'id', userID),
+		user: data.getdata('users', 'id', userID)[0],
 		userID
 	});
 }); // /delete_account
+
+// edit post
 router.get(`${config.site_path}/${config.edit_post_base_url}/:post_id`, (req,res) => {
 	const postID = req.params.post_id
-	const post = data.getdata('posts','id', postID)
-	const user = data.getdata('users', 'id', post.userID)
+	const post = data.getdata('posts','id', postID)[0]
+	const user = data.getdata('users', 'id', post.userID)[0]
 	res.render("forms/edit_post",
 	{
 		config,

src/routes/standard_pages.js

@@ -33,16 +33,17 @@ router.get(config.site_path, (req,res) => {
 // Users
 router.get(`${config.site_path}/user/:username`, (req, res) => {
 	const userID = func.get_userID(req.params.username)
-	let user = data.getdata('users', 'id', userID)
+	let posts = data.getdata('posts', 'userID', userID);
+	let user = data.getdata('users', 'id', userID)[0];
 	if (userID != -1) {
 		res.render("pages/user",
 		{
 			config,
 			locale,
-			posts: data.getdata('posts'),
+			posts,
 			user,
 			userID: userID,
-			comments: data.getdata('comments'),
+			comments: data.getdata('comments', 'postID'),
 			fromUnixTime,
 			format,
 			getUnixTime,
@@ -61,7 +62,7 @@ router.get(`${config.site_path}/user/:username`, (req, res) => {
 // Posts
 router.get(`${config.site_path}/post/:post_index`, (req, res) => {
 	const postID = parseInt(req.params.post_index)
-	let post = data.getdata('posts','id', postID)
+	let post = data.getdata('posts','id', postID)[0]
 	if (post == 1) { // data.getdata returns error code 1 if nothing is available
 		res.render("partials/message", {
 			message: locale.post_doesnt_exist,
@@ -78,8 +79,8 @@ router.get(`${config.site_path}/post/:post_index`, (req, res) => {
 			locale,
 			post,
 			postID,
-			user: data.getdata('users','id', post.userID),
-			comments: data.getdata('comments','id', postID),
+			user: data.getdata('users','id', post.userID)[0],
+			comments: data.getdata('comments','id', postID)[0]["comments"],
 			fromUnixTime,
 			format,
 			getUnixTime,
@@ -88,7 +89,7 @@ router.get(`${config.site_path}/post/:post_index`, (req, res) => {
 	}
 	else {
 		console.log("Error loading page")
-		res.redirect(301,"/")
+		res.redirect(301,config.site_path)
 	}
 }); // /post/:post_index
 
@@ -117,7 +118,7 @@ router.get(`${config.site_path}/comment/:postID-:commentID`, (req,res) => {
 	const commentID = parseInt(req.params.commentID);
 	const postID = parseInt(req.params.postID);
 
-	let posts_comments = data.getdata('comments', 'id', postID)["comments"]
+	let posts_comments = data.getdata('comments', 'id', postID)[0]["comments"]
 	let comment = 1
 	// For loop to find the comment with matching ID
 	posts_comments.forEach((current_comment, index) => {

src/routes/syndication.js

@@ -18,7 +18,8 @@ router.get(`${config.site_path}/rss`, (req,res) => {
 	}
 	else {
 		res.setHeader('content-type', 'application/rss+xml');
-		res.render("syndication/global_rss", {
+		res.render("syndication/rss", {
+			users: data.getdata('users'),
 			config,
 			posts: data.getdata('posts'),
 			func,
@@ -26,9 +27,10 @@ router.get(`${config.site_path}/rss`, (req,res) => {
 	};
 });
 // user RSS protocol gets
+// TODO specific title field and descriptions??
 router.get(`${config.site_path}/user/:username/rss`, (req,res) => {
 	const username = req.params.username;
-	const userID = func.get_userID(username);
+	const user = data.getdata('users','username',username)[0]; // Get the user data
 	if (config.rss == false) {
 		res.render("partials/message", {
 			message: locale.rss_disabled,
@@ -37,11 +39,11 @@ router.get(`${config.site_path}/user/:username/rss`, (req,res) => {
 	}
 	else {
 		res.setHeader('content-type', 'application/rss+xml');
-		res.render("syndication/user_rss", {
+		res.render("syndication/rss", {
+			users: [user],
 			config,
-			posts: data.getdata('posts'),
+			posts: data.getdata('posts','id',user['id']),
 			func,
-			userID,
 		})
 	};
 });
@@ -55,7 +57,7 @@ router.get(`${config.site_path}/atom`, (req,res) => {
 	}
 	else {
 		res.setHeader('content-type', 'application/rss+xml');
-		res.render("syndication/global_atom", {
+		res.render("syndication/atom", {
 			config,
 			posts: data.getdata('posts'),
 			func,
@@ -66,7 +68,6 @@ router.get(`${config.site_path}/atom`, (req,res) => {
 // user ATOM protocol gets
 router.get(`${config.site_path}/user/:username/atom`, (req,res) => {
 	const username = req.params.username;
-	const userID = func.get_userID(username);
 	if (config.atom == false) {
 		res.render("partials/message", {
 			message: locale.atom_disabled,
@@ -75,11 +76,10 @@ router.get(`${config.site_path}/user/:username/atom`, (req,res) => {
 	}
 	else {
 		res.setHeader('content-type', 'application/rss+xml');
-		res.render("syndication/user_atom", {
+		res.render("syndication/atom", {
 			config,
 			posts: data.getdata('posts'),
 			func,
-			userID,
 			getUnixTime,
 		})
 	};

src/server.js

@@ -50,6 +50,9 @@ function perform_checks()
 	exit_flag = false
 	required_values = ['site_admin','seperator','site_name','site_url','locale','port','cache_data','allow_signup','site_description','request_data_limit','enable_hitcount','charset','root_path','edit_account_base_url','new_post_url','signup_url','default_commenter_username','rss','atom','date_format','time_zone','css']
 	// Perform some standard checks:
+	if (config.site_path.slice(-1) == "/") { // cut off a trailing /
+		config.site_path = config.site_path.substring(0,config.site_path.length-1);
+	}
 
 	// data_storage
 	switch (config.data_storage)
@@ -83,6 +86,6 @@ function perform_checks()
 perform_checks()
 
 app.listen(config.port, () => {
-	console.log(`Server is running at http://localhost:${config.port} webroot: ${config.root_path}`);
+	console.log(`Server is running at http://localhost:${config.port}${config.site_path} webroot: ${config.root_path}`);
 	console.log("Running in: ", __dirname)
 })

views/forms/edit_account.ejs

@@ -1,22 +1,27 @@
 <!DOCTYPE html>
-<html lang="<%= config.language %">
-    <head>
-        <%- include("../partials/head") %>
-    </head>
-    <body>
-        <form action="<%= config.site_path %>/submit_edit_user" method="POST">
-            <input name="userID" type="hidden" value="<%= userID %>">
-            <label><%= locale.password %>:</label><br/>
-            <input type="password" required id="password" name="password"><br/><br/>
+<html lang="<%= config.language %>">
+	<head>
+		<%- include("../partials/head") %>
+	</head>
+	<body>
+		<div id="main">
+			<header id="site-header">
+				<%- include("../headers/site_wide") %> 
+			</header>
+			<form action="<%= config.site_path %>/submit_edit_user" method="POST">
+				<input name="userID" type="hidden" value="<%= userID %>">
+				<label><%= locale.password %>:</label><br/>
+				<input type="password" required id="password" name="password"><br/><br/>
 
-            <label><%= locale.prettyname %>:</label><br/>
-            <input name="prettyname" value="<%= user.prettyname %>"><br/><br/>
+				<label><%= locale.prettyname %>:</label><br/>
+				<input name="prettyname" value="<%= user.prettyname %>"><br/><br/>
 
-            <label><%= locale.description  %>:</label><br/>
-            <textarea name="description"><%= user.description %></textarea><br/><br/>
+				<label><%= locale.description  %>:</label><br/>
+				<textarea name="description"><%= user.description %></textarea><br/><br/>
 
-            <label><%- locale.delete_account_confirmation %>: </label><input type="checkbox" name="agreement"><br/>
-            <input type="submit" value="Submit"><br/>
-        </form>
-    </body>
+				<label><%- locale.delete_account_confirmation %>: </label><input type="checkbox" name="agreement"><br/>
+				<input type="submit" value="Submit"><br/>
+			</form>
+		</div>
+	</body>
 </html>

views/forms/edit_post.ejs

@@ -1,27 +1,32 @@
 <!DOCTYPE html>
 <html lang="<%= config.language %>">
-    <head>
-        <%- include("../partials/head") %>
-    </head>
-    <body>
-        <form action="<%= config.site_path %>/submit_edit_post" method="POST" onsubmit="sha512password()">
-            <input name="userID" type="hidden" value="<%= post['userID'] %>">
-            <input name="postID" type="hidden" value="<%= postID %>">
+	<head>
+		<%- include("../partials/head") %>
+	</head>
+	<body>
+		<div id="main">
+			<header id="site-header">
+				<%- include("../headers/site_wide") %> 
+			</header>
+			<form action="<%= config.site_path %>/submit_edit_post" method="POST" onsubmit="sha512password()">
+				<input name="userID" type="hidden" value="<%= post['userID'] %>">
+				<input name="postID" type="hidden" value="<%= postID %>">
 
-            <label><%= locale.password %>:</label><br/>
-            <input type="password" required id="password" name="password"><br/><br/>
+				<label><%= locale.password %>:</label><br/>
+				<input type="password" required id="password" name="password"><br/><br/>
 
-            <label><%= locale.title %>:</label><br/>
-            <input value="<%=post['title'] %>" required name="title"><br/><br/>
+				<label><%= locale.title %>:</label><br/>
+				<input value="<%=post['title'] %>" required name="title"><br/><br/>
 
-            <label><%= locale.post_content %>:</label><br/>
-            <textarea required name="content"><%= post['content'] %></textarea><br/><br/>
+				<label><%= locale.post_content %>:</label><br/>
+				<textarea required name="content"><%= post['content'] %></textarea><br/><br/>
 
-            <label><%= locale.tags %>:</label><br/>
-            <input value="<%= post['tags'] %>" name="tags"><br/><br/>
+				<label><%= locale.tags %>:</label><br/>
+				<input value="<%= post['tags'] %>" name="tags"><br/><br/>
 
-            <label>Delete forever (no undo): </label><input name="delete" type="checkbox"><br/>
-            <input type="submit" value="Submit"><br/>
-        </form>
-    </body>
+				<label>Delete forever (no undo): </label><input name="delete" type="checkbox"><br/>
+				<input type="submit" value="Submit"><br/>
+			</form>
+		</div>
+	</body>
 </html>

views/forms/new_post.ejs

@@ -4,22 +4,28 @@
         <%- include('../partials/head.ejs') %>
     </head>
     <body>
-    <form action="<%= config.site_path %>/submit_post" method="POST">
-        <label><%= locale.username %>:</label><br/>
-        <input required name="username"><br/><br/>
+		<div id="main">
+			<header id="site-header">
+				<%- include("../headers/site_wide") %> 
+			</header>
+			<form action="<%= config.site_path %>/submit_post" method="POST">
+				<label><%= locale.username %>:</label><br/>
+				<input required name="username"><br/><br/>
 
-        <label><%= locale.password %>:</label><br/>
-        <input type="password" required id="password" name="password"><br/><br/>
+				<label><%= locale.password %>:</label><br/>
+				<input type="password" required id="password" name="password"><br/><br/>
 
-        <label><%= locale.title %>:</label><br/>
-        <input required name="title"><br/><br/>
+				<label><%= locale.title %>:</label><br/>
+				<input required name="title"><br/><br/>
 
-        <label><%= locale.post_content %>:</label><br/>
-        <textarea required name="content"></textarea><br/><br/>
+				<label><%= locale.post_content %>:</label><br/>
+				<textarea required name="content"></textarea><br/><br/>
 
-        <label><%= locale.tags %>:</label><br/>
-        <input name="tags"><br/><br/>
+				<label><%= locale.tags %>:</label><br/>
+				<input name="tags"><br/><br/>
 
-        <input type="submit" value="Submit"><br/>
-    </body>
-</form></html>
+				<input type="submit" value="Submit"><br/>
+			</form>
+		</div>
+	</body>
+</html>

views/forms/signup.ejs

@@ -1,24 +1,29 @@
 <!DOCTYPE html>
 </html lang="<%= config.language %>">
-    <head>
-        <%- include("../partials/head") %>
-    </head>
-    <body>
-        <form action="<%= config.site_path %>/submit_signup" method="POST">
-            <label><%= locale.username %></label><br/>
-            <input required name="username"><br/><br/>
+	<head>
+		<%- include("../partials/head") %>
+	</head>
+	<body>
+		<div id="main">
+			<header id="site-header">
+				<%- include("../headers/site_wide") %> 
+			</header>
+			<form action="<%= config.site_path %>/submit_signup" method="POST">
+				<label><%= locale.username %></label><br/>
+				<input required name="username"><br/><br/>
 
-            <label><%= locale.prettyname %></label><br/>
-            <input required name="prettyname"><br/><br/>
+				<label><%= locale.prettyname %></label><br/>
+				<input required name="prettyname"><br/><br/>
 
-            <label><%= locale.password %></label><br/>
-            <input type="password" required id="password" name="password"><br/><br/>
+				<label><%= locale.password %></label><br/>
+				<input type="password" required id="password" name="password"><br/><br/>
 
-            <label><%= locale.description %></label><br/>
-            <textarea id="description" name="description"></textarea><br/><br/>
+				<label><%= locale.description %></label><br/>
+				<textarea id="description" name="description"></textarea><br/><br/>
 
-            <label><%- locale.signup_agreement %>: </label><input type="checkbox" name="agreement" required><br/>
-            <input type="submit" value="Submit"><br/>
-        </form>
-    </body>
+				<label><%- locale.signup_agreement %>: </label><input type="checkbox" name="agreement" required><br/>
+				<input type="submit" value="Submit"><br/>
+			</form>
+		</div>
+	</body>
 </html>

views/indexes/all_pages.ejs

@@ -1,47 +1,49 @@
 <!DOCTYPE html>
 <html lang="<%= config.charset %>">
-    <head>
-        <%- include("../partials/head") %>
-    </head>
-    <body>
-        Misc:<br/>
-        <a href="<%= config.site_path %>/">Home Page</a><br/>
-        <a href="<%= config.site_path %><%= config.new_post_url %>">New Post Form</a><br/>
-        <a href="<%= config.site_path %><%= config.signup_url %>">Signup Form</a><br/>
-        Indexes:<br/>
-        <a href="<%= config.site_path %>/index/posts">Posts Index</a><br/>
-        <a href="<%= config.site_path %>/index/users">Users Index</a><br/>
-        <a href="<%= config.site_path %>/index/comments">Comments Index</a><br/>
-        Posts:<br/>
-        <% for (let postID = 0; postID < posts.length; postID++) { %>
-        <% if (posts[postID]["deleted"] != true) { %>
-        <a href="<%= config.site_path %>/post/<%= postID %>"><%= posts[postID]["title"] %></a><br/>
-        <% }; %>
-        <% }; %>
-        Comments:<br/>
-        <% for (let postID = 0; postID < comments.length; postID++) { %>
-        <% for (let comment_index = 0; comment_index < comments[postID]['comments'].length; comment_index++) { %>
-        <a href="<%= config.site_path %>/comment/<%= postID %>-<%= comment_index %>"><%= postID %>-<%= comment_index %></a><br/>
-        <% }; %>
-        <% }; %>
-        Users:<br/>
-        <% for (let userID = 0; userID < users.length; userID++) { %>
-        <% if (users[userID]["deleted"] != true) { %>
-        <a href="<%= config.site_path %>/user/<%= users[userID]["username"] %>"><%= users[userID]["username"] %></a><br/>
-        <% }; %>
-        <% }; %>
-        Edit Posts:<br/>
-        <% for (let postID = 0; postID < posts.length; postID++) { %>
-        <% if (posts[postID]["deleted"] != true) { %>
-        <a href="<%= config.site_path %><%= config.edit_post_base_url %>/<%= postID %>">Edit <%= posts[postID]["title"] %></a><br/>
-        <% }; %>
-        <% }; %>
-        Edit Users:<br/>
-        <% for (let userID = 0; userID < users.length; userID++) { %>
-        <% if (users[userID]["deleted"] != true) { %>
-        <a href="<%= config.site_path %><%= config.edit_account_base_url %>/<%= users[userID]["username"] %>">Edit <%= users[userID]["username"] %></a><br/>
-        <% }; %>
-        <% }; %>
-        <!-- TODO add tags -->
-    </body>
+	<head>
+		<%- include("../partials/head") %>
+	</head>
+	<body>
+		<div id="main">
+			Misc:<br/>
+			<a href="<%= config.site_path %>/">Home Page</a><br/>
+			<a href="<%= config.site_path %><%= config.new_post_url %>">New Post Form</a><br/>
+			<a href="<%= config.site_path %><%= config.signup_url %>">Signup Form</a><br/>
+			Indexes:<br/>
+			<a href="<%= config.site_path %>/index/posts">Posts Index</a><br/>
+			<a href="<%= config.site_path %>/index/users">Users Index</a><br/>
+			<a href="<%= config.site_path %>/index/comments">Comments Index</a><br/>
+			Posts:<br/>
+			<% for (let postID = 0; postID < posts.length; postID++) { %>
+			<% if (posts[postID]["deleted"] != true) { %>
+			<a href="<%= config.site_path %>/post/<%= postID %>"><%= posts[postID]["title"] %></a><br/>
+			<% }; %>
+			<% }; %>
+			Comments:<br/>
+			<% for (let postID = 0; postID < comments.length; postID++) { %>
+			<% for (let comment_index = 0; comment_index < comments[postID]['comments'].length; comment_index++) { %>
+			<a href="<%= config.site_path %>/comment/<%= postID %>-<%= comment_index %>"><%= postID %>-<%= comment_index %></a><br/>
+			<% }; %>
+			<% }; %>
+			Users:<br/>
+			<% for (let userID = 0; userID < users.length; userID++) { %>
+			<% if (users[userID]["deleted"] != true) { %>
+			<a href="<%= config.site_path %>/user/<%= users[userID]["username"] %>"><%= users[userID]["username"] %></a><br/>
+			<% }; %>
+			<% }; %>
+			Edit Posts:<br/>
+			<% for (let postID = 0; postID < posts.length; postID++) { %>
+			<% if (posts[postID]["deleted"] != true) { %>
+			<a href="<%= config.site_path %><%= config.edit_post_base_url %>/<%= postID %>">Edit <%= posts[postID]["title"] %></a><br/>
+			<% }; %>
+			<% }; %>
+			Edit Users:<br/>
+			<% for (let userID = 0; userID < users.length; userID++) { %>
+			<% if (users[userID]["deleted"] != true) { %>
+			<a href="<%= config.site_path %><%= config.edit_account_base_url %>/<%= users[userID]["username"] %>">Edit <%= users[userID]["username"] %></a><br/>
+			<% }; %>
+			<% }; %>
+			<!-- TODO add tags -->
+		</div>
+	</body>
 </html>

views/indexes/comments.ejs

@@ -1,13 +1,15 @@
 <!DOCTYPE html>
 <html lang="<%= config.charset %>">
-    <head>
-        <%- include("../partials/head") %>
-    </head>
-    <body>
-        <% for (let postID = 0; postID < comments.length; postID++) { %>
-        <% for (let comment_index = 0; comment_index < comments[postID]['comments'].length; comment_index++) { %>
-        <a href="<%= config.site_path %>/comment/<%= postID %>-<%= comment_index %>"><%= postID %>-<%= comment_index %></a><br/>
-        <% }; %>
-        <% }; %>
-    </body>
+	<head>
+		<%- include("../partials/head") %>
+	</head>
+	<body>
+		<div id="main">
+			<% for (let postID = 0; postID < comments.length; postID++) { %>
+			<% for (let comment_index = 0; comment_index < comments[postID]['comments'].length; comment_index++) { %>
+			<a href="<%= config.site_path %>/comment/<%= postID %>-<%= comment_index %>"><%= postID %>-<%= comment_index %></a><br/>
+			<% }; %>
+			<% }; %>
+			</div>
+	</body>
 </html>

views/indexes/posts.ejs

@@ -1,13 +1,15 @@
 <!DOCTYPE html>
 <html lang="<%= config.charset %>">
-    <head>
-        <%- include("../partials/head") %>
-    </head>
-    <body>
-        <% for (let postID = 0; postID < posts.length; postID++) { %>
-        <% if (posts[postID]["deleted"] != true) { %>
-        <a href="<%= config.site_path %>/post/<%= postID %>"><%= posts[postID]["title"] %></a><br/>
-        <% }; %>
-        <% }; %>
-    </body>
+	<head>
+		<%- include("../partials/head") %>
+	</head>
+	<body>
+		<div id="main">
+			<% for (let postID = 0; postID < posts.length; postID++) { %>
+			<% if (posts[postID]["deleted"] != true) { %>
+			<a href="<%= config.site_path %>/post/<%= postID %>"><%= posts[postID]["title"] %></a><br/>
+			<% }; %>
+			<% }; %>
+		</div>
+	</body>
 </html>

views/indexes/users.ejs

@@ -1,13 +1,15 @@
 <!DOCTYPE html>
 <html lang="<%= config.charset %>">
-    <head>
-        <%- include("../partials/head") %>
-    </head>
-    <body>
-        <% for (let userID = 0; userID < users.length; userID++) { %>
-        <% if (users[userID]["deleted"] != true) { %>
-        <a href="<%= config.site_path %>/user/<%= users[userID]["username"] %>"><%= users[userID]["username"] %></a><br/>
-        <% }; %>
-        <% }; %>
-    </body>
+	<head>
+		<%- include("../partials/head") %>
+	</head>
+	<body>
+		<div id="main">
+			<% for (let userID = 0; userID < users.length; userID++) { %>
+			<% if (users[userID]["deleted"] != true) { %>
+			<a href="<%= config.site_path %>/user/<%= users[userID]["username"] %>"><%= users[userID]["username"] %></a><br/>
+			<% }; %>
+			<% }; %>
+		</div>
+	</body>
 </html>

views/pages/comment.ejs

@@ -1,26 +1,28 @@
 <!DOCTYPE html>
 <html lang="en">
-    <head>
-        <%- include('../partials/head'); %>
-    </head>
-    <body>
-        <header id="site-header">
-            <%- include("../headers/site_wide") %>
-        </header>
-        <div id="comment">
-            <%- include("../partials/comment"); %>
-        </div>
-        <%- config.seperator %>
-        <b><%= locale.reply %>:</b>
-        <div id="post-commentform">
-            <!-- Comment form -->
-            <form method="POST" action="/submit_comment">
-                <input type="hidden" name="post_index" value="<%= postID %>">
-                <label><%= locale.username %>:</label><br/><input name="name"><br/><br/>
-                <label><%= locale.comment %>:</label><br/><textarea name="content">>> <%- postID %>-<%- commentID %>
-</textarea><br/>
-                <button type="submit"><%= locale.submit %></button>
-            </form>
-        </div>
-    </body>
+	<head>
+		<%- include('../partials/head'); %>
+	</head>
+	<body>
+		<div id="main">
+			<header id="site-header">
+				<%- include("../headers/site_wide") %>
+			</header>
+			<div id="comment">
+				<%- include("../partials/comment"); %>
+			</div>
+			<%- config.seperator %>
+			<b><%= locale.reply %>:</b>
+			<div id="post-commentform">
+				<!-- Comment form -->
+				<form method="POST" action="/submit_comment">
+					<input type="hidden" name="post_index" value="<%= postID %>">
+					<label><%= locale.username %>:</label><br/><input name="name"><br/><br/>
+					<label><%= locale.comment %>:</label><br/><textarea name="content">>> <%- postID %>-<%- commentID %>
+	</textarea><br/>
+					<button type="submit"><%= locale.submit %></button>
+				</form>
+			</div>
+		</div>
+	</body>
 </html>

views/pages/post.ejs

@@ -1,17 +1,19 @@
 <!DOCTYPE html>
 <html lang="en">
-    <head>
-        <%- include('../partials/head'); %>
-    </head>
-    <body>
-        <header id="site-header">
-            <%- include("../headers/site_wide") %>
-        </header>
-        <div id="posts">
-            <%- include('../posts/post'); %>
-        </div>
-        <footer id='footer'>
-            <%- include('../partials/footer'); %>
-        </footer>
-    </body>
+	<head>
+		<%- include('../partials/head'); %>
+	</head>
+	<body>
+		<div id="main">
+			<header id="site-header">
+				<%- include("../headers/site_wide") %>
+			</header>
+			<div id="posts">
+				<%- include('../posts/post'); %>
+			</div>
+			<footer id='footer'>
+				<%- include('../partials/footer'); %>
+			</footer>
+		</div>
+	</body>
 </html>

views/pages/search.ejs

@@ -4,34 +4,36 @@
 		<%- include('../partials/head'); %>
 	</head>
 	<body>
-		<div id='site-header'>
-			<%- include('../headers/site_wide'); %>
-		</div>
+		<div id="main">
+			<div id='site-header'>
+				<%- include('../headers/site_wide'); %>
+			</div>
 
-		<div id='advanced-search'>
-			<form method="GET" action="/search">
-				<label>Search Term:</label>
-				<input type='text' placeholder='🔍' name='q' value='<%- search_term %>'><br/>
+			<div id='advanced-search'>
+				<form method="GET" action="/search">
+					<label>Search Term:</label>
+					<input type='text' placeholder='🔍' name='q' value='<%- search_term %>'><br/>
 
-				<label>Search for:</label><br/>
-				<label>Post:</label>
-				<input type="checkbox" name="type" value="post" <% if (search_type.includes('post')) {%>checked<% } %>><br/>
-				<label>User:</label>
-				<input type="checkbox" name="type" value="user" <% if (search_type.includes('user')) {%>checked<% } %>><br/>
+					<label>Search for:</label><br/>
+					<label>Post:</label>
+					<input type="checkbox" name="type" value="post" <% if (search_type.includes('post')) {%>checked<% } %>><br/>
+					<label>User:</label>
+					<input type="checkbox" name="type" value="user" <% if (search_type.includes('user')) {%>checked<% } %>><br/>
 
-				<input type="submit" value="Submit">
-			</form>
-		</div>
+					<input type="submit" value="Submit">
+				</form>
+			</div>
 
-		<%- config.seperator %>
+			<%- config.seperator %>
 			
-		<div id='results'>
-			<% search_results.posts.forEach((result, index) => { %>
-			<a href="/post/<%- result.id %>"><%- result.title %></a><br/>
-			<% }); %>
-			<% search_results.users.forEach((result, index) => { %>
-			<a href="/user/<%- result.username %>"><%- result.prettyname %></a><br/>
-			<% }); %>
+			<div id='results'>
+				<% search_results.posts.forEach((result, index) => { %>
+				<a href="/post/<%- result.id %>"><%- result.title %></a><br/>
+				<% }); %>
+				<% search_results.users.forEach((result, index) => { %>
+				<a href="/user/<%- result.username %>"><%- result.prettyname %></a><br/>
+				<% }); %>
+			</div>
 		</div>
 	</body>
 </html>

views/pages/tag.ejs

@@ -1,28 +1,30 @@
 <!DOCTYPE html>
 <html lang="en">
-    <head>
-        <%- include('../partials/head'); %>
-    </head>
-    <body>
-        <header id="site-header">
-            <%- include('../headers/site_wide'); %>
-        </header>
-        <header id='page-header'>
-            <%- include('../headers/tag'); %>
-        </header>
-        <div id="posts">
-            <% for (let index = posts.length - 1; index >= 0; index--) { %>
-                <% if ( posts[index].deleted != true) { %>
-                    <% posts[index].tags.forEach((current_tag, tag_index) => { %> 
-                        <% if (current_tag.toLowerCase() == tag.toLowerCase()) { %>
-                            <%- include('../posts/tag', {post: posts[index], postID: index, user: users[posts[index].userID], comments: comments[index]}); %>
-                        <% } %>
-                    <% }) %>
-                <% } %>
-            <% } %>
-        </div>
-        <footer id='footer'>
-            <%- include('../partials/footer'); %>
-        </footer>
-    </body>
+	<head>
+		<%- include('../partials/head'); %>
+	</head>
+	<body>
+		<div id="main">
+			<header id="site-header">
+				<%- include('../headers/site_wide'); %>
+			</header>
+			<header id='page-header'>
+				<%- include('../headers/tag'); %>
+			</header>
+			<div id="posts">
+				<% for (let index = posts.length - 1; index >= 0; index--) { %>
+					<% if ( posts[index].deleted != true) { %>
+						<% posts[index].tags.forEach((current_tag, tag_index) => { %> 
+							<% if (current_tag.toLowerCase() == tag.toLowerCase()) { %>
+								<%- include('../posts/tag', {post: posts[index], postID: index, user: users[posts[index].userID], comments: comments[index]}); %>
+							<% } %>
+						<% }) %>
+					<% } %>
+				<% } %>
+			</div>
+			<footer id='footer'>
+				<%- include('../partials/footer'); %>
+			</footer>
+		</div>
+	</body>
 </html>

views/pages/timeline.ejs

@@ -1,24 +1,26 @@
 <!DOCTYPE html>
 <html lang="en">
-    <head>
-        <%- include('../partials/head'); %>
-    </head>
-    <body>
-        <header id="site-header">
-            <%- include("../headers/site_wide") %> 
-        </header>
-        <header id='page-header'>
-            <%- include('../headers/timeline'); %>
-        </header>
-        <div id="posts">
-            <% for (let index = posts.length - 1; index >= 0; index--) { %>
-            <% if (posts[index]["deleted"] != true) { %>
-                    <%- include('../posts/timeline', {post: posts[index], postID: index, user: users[posts[index].userID], comments: comments[index]}); %>
-                <% } %>
-            <% } %>
-        </div>
-        <footer id='footer'>
-            <%- include('../partials/footer'); %>
-        </footer>
-    </body>
+	<head>
+		<%- include('../partials/head'); %>
+	</head>
+	<body>
+		<div id="main">
+			<header id="site-header">
+				<%- include("../headers/site_wide") %> 
+			</header>
+			<header id='page-header'>
+				<%- include('../headers/timeline'); %>
+			</header>
+			<div id="posts">
+				<% for (let index = posts.length - 1; index >= 0; index--) { %>
+				<% if (posts[index]["deleted"] != true) { %>
+						<%- include('../posts/timeline', {post: posts[index], postID: index, user: users[posts[index].userID], comments: comments[index]}); %>
+					<% } %>
+				<% } %>
+			</div>
+			<footer id='footer'>
+				<%- include('../partials/footer'); %>
+			</footer>
+		</div>
+	</body>
 </html>

views/pages/user.ejs

@@ -1,24 +1,26 @@
 <!DOCTYPE html>
 <html lang="en">
-    <head>
-        <%- include('../partials/head'); %>
-    </head>
-    <body>
-        <header id="site-header">
-            <%- include("../headers/site_wide") %>
-        </header>
-        <header id='page-header'>
-            <%- include('../headers/user'); %>
-        </header>
-        <div id="posts">
-            <% for (let index = posts.length - 1; index >= 0; index--) { %>
-                <% if (posts[index].userID == userID) { %>
-                    <%- include('../posts/user', {post: posts[index], postID: index, user: user, comments: comments[index]}); %>
-                    <% } %>
-            <% } %>
-        </div>
-        <footer id='footer'>
-            <%- include('../partials/footer'); %>
-        </footer>
-    </body>
+	<head>
+		<%- include('../partials/head'); %>
+	</head>
+	<body>
+		<div id="main">
+			<header id="site-header">
+				<%- include("../headers/site_wide") %>
+			</header>
+			<header id='page-header'>
+				<%- include('../headers/user'); %>
+			</header>
+			<div id="posts">
+				<% for (let index = posts.length - 1; index >= 0; index--) { %>
+					<% if (posts[index].userID == userID) { %>
+						<%- include('../posts/user', {post: posts[index], postID: index, user: user, comments: comments[index]}); %>
+						<% } %>
+				<% } %>
+			</div>
+			<footer id='footer'>
+				<%- include('../partials/footer'); %>
+			</footer>
+		</div>
+	</body>
 </html>

views/partials/head.ejs

@@ -1,6 +1,6 @@
 <meta charset="<%- config.charset %>">
 <meta name='robots' content='noindex'>
-<title><%= config.site_path %></title>
+<title><%= config.site_name %></title>
 
 <style>
 

views/syndication/atom.ejs

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="<%= config.charset %>" ?>
+<feed xmlns="http://www.w3.org/2005/Atom">
+	<title><%= config.site_name %></title>
+	<link><%= config.site_url %></title>
+	<description><%= config.site_description %></description>
+	<updated><%= func.unix_time_to_date_format(getUnixTime(new Date()),"yyyy-MM-dd'T'HH:mm:ss'Z'") %></updated>
+	<id><%= config.site_url %></id>
+	<% for (let postID = posts.length-1; postID >= 0; postID--) { %>
+	<% if (posts[postID]["deleted"] != true) { %>
+	<entry>
+		<title><%= posts[postID]["title"] %></title>
+		<link><%= config.site_url %>/post/<%= postID %></link>
+		<summary><![CDATA[<%- (posts[postID]["content"]) %>]]></summary>
+		<guid isPermaLink="true"><%= config.site_url %>/post/<%= postID %></guid>
+		<pubDate><%# func.unix_time_to_date_format(posts[postID]['pubdate'],"yyyy-MM-dd'T'HH:mm:ss'Z'") %></pubDate>
+		<% for (let tag_index = 0; tag_index < posts[postID]['tags'].length; tag_index++) { %>
+		<category><![CDATA[<%= posts[postID]['tags'][tag_index] %>]]></category>
+		<% } %>
+	</entry>
+	<% } %>
+	<% } %>
+</feed>

views/syndication/global_atom.ejs

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="<%= config.charset %>" ?>
-<feed xmlns="http://www.w3.org/2005/Atom">
-    <title><%= config.site_name %></title>
-    <link><%= config.site_url %></title>
-    <description><%= config.site_description %></description>
-    <updated><%= func.unix_time_to_atom_date(getUnixTime(new Date())) %></updated>
-    <id><%= config.site_url %></id>
-    <% for (let postID = posts.length-1; postID >= 0; postID--) { %>
-    <% if (posts[postID]["deleted"] != true) { %>
-    <entry>
-        <title><%= posts[postID]["title"] %></title>
-        <link><%= config.site_url %>/post/<%= postID %></link>
-        <summary><![CDATA[<%- func.render_md(posts[postID]["content"]) %>]]></summary>
-        <guid isPermaLink="true"><%= config.site_url %>/post/<%= postID %></guid>
-        <pubDate><%# func.unix_time_to_atom_date(posts[postID]['pubdate']) %></pubDate>
-        <% for (let tag_index = 0; tag_index < posts[postID]['tags'].length; tag_index++) { %>
-        <category><![CDATA[<%= posts[postID]['tags'][tag_index] %>]]></category>
-        <% } %>
-    </entry>
-    <% } %>
-    <% } %>
-</feed>

views/syndication/global_rss.ejs

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="<%= config.charset %>" ?>
-<rss version="2.0">
-    <channel>
-        <title><%= config.site_name %></title>
-        <link><%= config.site_url %></title>
-        <description><%= config.site_description %></description>
-        <% for (let postID = posts.length-1; postID >= 0; postID--) { %>
-        <% if (posts[postID]["deleted"] != true) { %>
-        <item>
-            <title><%= posts[postID]["title"] %></title>
-            <link><%= config.site_url %>/post/<%= postID %></link>
-            <description><![CDATA[<%- func.render_md(posts[postID]["content"]) %>]]></description>
-            <guid isPermaLink="true"><%= config.site_url %>/post/<%= postID %></guid>
-            <pubDate><%= func.unix_time_to_rss_date(posts[postID]['pubdate']) %></pubDate>
-            <% for (let tag_index = 0; tag_index < posts[postID]['tags'].length; tag_index++) { %>
-            <category><![CDATA[<%= posts[postID]['tags'][tag_index] %>]]></category>
-            <% } %>
-        </item>
-        <% } %>
-        <% } %>
-    </channel>
-</rss>

views/syndication/rss.ejs

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="<%= config.charset %>" ?>
+<rss version="2.0">
+	<channel>
+		<title><%= config.site_name %></title>
+		<link><%= config.site_url %></link>
+		<description><%= config.site_description %></description>
+		<% for (let postID = posts.length-1; postID >= 0; postID--) { %>
+		<% if (posts[postID]["deleted"] != true) { %>
+		<item>
+			<title><%= posts[postID]["title"] %></title>
+			<link><%= config.site_url %>/post/<%= postID %></link>
+			<description><![CDATA[<%- (posts[postID]["content"]) %>]]></description>
+			<guid isPermaLink="true"><%= config.site_url %>/post/<%= postID %></guid>
+			<pubDate><%= func.unix_time_to_date_format(posts[postID]['pubdate'],'EEE, dd MMM yyyy HH:mm:ss') %></pubDate>
+			<author><%= users[posts[postID]['userID']]['prettyname'] %></author>
+			<% for (let tag_index = 0; tag_index < posts[postID]['tags'].length; tag_index++) { %>
+			<category><![CDATA[<%= posts[postID]['tags'][tag_index] %>]]></category>
+			<% } %>
+		</item>
+		<% } %>
+		<% } %>
+	</channel>
+</rss>

views/syndication/user_atom.ejs

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="<%= config.charset %>" ?>
-<feed xmlns="http://www.w3.org/2005/Atom">
-    <title><%= config.site_name %></title>
-    <link><%= config.site_url %></title>
-    <description><%= config.site_description %></description>
-    <updated><%= func.unix_time_to_atom_date(getUnixTime(new Date())) %></updated>
-    <id><%= config.site_url %></id>
-    <% for (let postID = posts.length-1; postID >= 0; postID--) { %>
-    <% if (posts[postID]["userID"] == userID) { %>
-    <% if (posts[postID]["deleted"] != true) { %>
-    <entry>
-        <title><%= posts[postID]["title"] %></title>
-        <link><%= config.site_url %>/post/<%= postID %></link>
-        <summary><![CDATA[<%- func.render_md(posts[postID]["content"]) %>]]></summary>
-        <guid isPermaLink="true"><%= config.site_url %>/post/<%= postID %></guid>
-        <pubDate><%# func.unix_time_to_atom_date(posts[postID]['pubdate']) %></pubDate>
-        <% for (let tag_index = 0; tag_index < posts[postID]['tags'].length; tag_index++) { %>
-        <category><![CDATA[<%= posts[postID]['tags'][tag_index] %>]]></category>
-        <% } %>
-    </entry>
-    <% } %>
-    <% } %>
-    <% } %>
-</feed>

views/syndication/user_rss.ejs

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="<%= config.charset %>" ?>
-<rss version="2.0">
-    <channel>
-        <title><%= config.site_name %></title>
-        <link><%= config.site_url %></title>
-        <description><%= config.site_description %></description>
-        <% for (let postID = posts.length-1; postID >= 0; postID--) { %>
-        <% if (posts[postID]["userID"] == userID) { %>
-        <% if (posts[postID]["deleted"] != true) { %>
-        <item>
-            <title><%= posts[postID]["title"] %></title>
-            <link><%= config.site_url %>/post/<%= postID %></link>
-	    <description><![CDATA[<%- func.render_md(posts[postID]["content"]) %>]]></description>
-            <guid isPermaLink="true"><%= config.site_url %>/post/<%= postID %></guid>
-            <pubDate><%= func.unix_time_to_rss_date(posts[postID]['pubdate']) %></pubDate>
-            <% for (let tag_index = 0; tag_index < posts[postID]['tags'].length; tag_index++) { %>
-            <category><![CDATA[<%= posts[postID]['tags'][tag_index] %>]]></category>
-            <% } %>
-        </item>
-        <% } %>
-        <% } %>
-        <% } %>
-    </channel>
-</rss>

webroot/default.css

@@ -30,7 +30,6 @@ a {
 	  border: none;
 	  border-radius: 0px;
 	  font-size: 14px;
-   }
 }
 a:hover {
 	text-decoration: underline;
@@ -56,7 +55,9 @@ a:hover {
 	.comment:nth-child(even) {
 		background: #1E1E1E;
 	}
-
+	.named-fence-filename {
+		border: 1px white solid; 
+	}
 }
 
 @media (prefers-color-scheme: light) {
@@ -70,4 +71,7 @@ a:hover {
 	.comment:nth-child(even) {
 		background: #EEEEEE;
 	}
+	.named-fence-filename {
+		border: 1px black solid; 
+	}
 }