From cfe9706e315add7bbe84678c1f1953cf9ed5c224 Mon Sep 17 00:00:00 2001
From: YourFriendlyNeighborhoodDealer <qminer@2girls1dj.com>
Date: Mon, 4 Mar 2019 07:54:53 +0100
Subject: [PATCH 1/2] Added subject and question count to questions page

---
 server.js         | 9 +++++++--
 views/alldata.ejs | 2 ++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/server.js b/server.js
index eb1bd27..395fe93 100644
--- a/server.js
+++ b/server.js
@@ -140,10 +140,15 @@ app.get('/legacy', function(req, res) {
 
 	var f = utils.ReadFile(dataFile);
 	var d = actions.LoadJSON(f);
-	var raw = d.toString().split("\n");
+	let qcount = 0;
+	for (let i = 0; i < d.length; i++)
+		qcount += d.Subjects[i].length;
+	let scount = d.length;
 
 	res.render('alldata', {
-		data: d
+		data: d,
+		scount: scount,
+		qcount: qcount
 	});
 
 	Log(req);
diff --git a/views/alldata.ejs b/views/alldata.ejs
index 459f88e..62f1635 100644
--- a/views/alldata.ejs
+++ b/views/alldata.ejs
@@ -59,6 +59,8 @@
 	<center>
 		<h2>
 			Ennek az oldalnak a tartalma dinamikusan frissül minden beküldött kérdés után
+			</br>
+			<%=scount%> tárgy és <%=qcount%> kérdés
 		</h2>
 	</center>
 	<% for (var i = 0; i < data.Subjects.length; i++) { %>

From c53c181a5b71782ac7517bc38f76e17d32ff299a Mon Sep 17 00:00:00 2001
From: YourFriendlyNeighborhoodDealer <qminer@2girls1dj.com>
Date: Mon, 4 Mar 2019 10:25:10 +0100
Subject: [PATCH 2/2] Changed some https stuff

---
 server.js | 38 ++++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/server.js b/server.js
index 395fe93..af860a8 100644
--- a/server.js
+++ b/server.js
@@ -18,7 +18,7 @@
 
  ------------------------------------------------------------------------- */
 
-const startHTTPS = false;
+const startHTTPS = true;
 const siteUrl = "https://qmining.tk"; // http(s)//asd.basd
 const ircURL = "https://kiwiirc.com/nextclient/irc.sub.fm/#qmining";
 
@@ -48,21 +48,26 @@ const logFile = "stats/logs";
 const allLogFile = "/nlogs/log";
 
 // https://certbot.eff.org/
-const privkeyFile = "/etc/letsencrypt/live/questionmining.tk/privkey.pem";
-const fullchainFile = "/etc/letsencrypt/live/questionmining.tk/fullchain.pem";
-const chainFile = "/etc/letsencrypt/live/questionmining.tk/chain.pem";
+const privkeyFile = "/etc/letsencrypt/live/qmining.tk/privkey.pem";
+const fullchainFile = "/etc/letsencrypt/live/qmining.tk/fullchain.pem";
+const chainFile = "/etc/letsencrypt/live/qmining.tk/chain.pem";
 
 var certsLoaded = false;
 if (startHTTPS && utils.FileExists(privkeyFile) && utils.FileExists(fullchainFile) && utils.FileExists(chainFile)) {
-	const key = fs.readFileSync(privkeyFile, "utf8");
-	const cert = fs.readFileSync(fullchainFile, "utf8");
-	const ca = fs.readFileSync(chainFile, "utf8");
-	var certs = {
-		key: key,
-		cert: cert,
-		ca: ca
-	};
-	certsLoaded = true;
+	try {
+		const key = fs.readFileSync(privkeyFile, "utf8");
+		const cert = fs.readFileSync(fullchainFile, "utf8");
+		const ca = fs.readFileSync(chainFile, "utf8");
+		var certs = {
+			key: key,
+			cert: cert,
+			ca: ca
+		};
+		certsLoaded = true;
+
+	} catch (e) {
+		logger.Log("Error loading cert files!", logger.GetColor("redbg"));
+	}
 }
 
 const port = 8080;
@@ -73,13 +78,6 @@ var highlights = ["public", "static", "manual", "isgetting", "postfeedback",
 ];
 
 app.set('view engine', 'ejs');
-//app.all('*', function(req, res, next) {
-//	if(req.secure) {
-//		next();
-//	} else {
-//		res.redirect('https://' + req.hostname + req.url); 
-//	}
-//});
 app.use(function(req, res, next) {
 	res.on('finish', function() {
 		Log(req, true, res.statusCode);