Merge

modules/stuff.js

@@ -49,7 +49,7 @@ app.use(bodyParser.json({
 // --------------------------------------------------------------
 
 app.get('/*', function (req, res) {
-  let parsedUrl = req.url.replace(/%20/g, " ")
+  let parsedUrl = req.url.replace(/%20/g, " ")                                                  
   let curr = listedFiles + '/' + parsedUrl.substring('/'.length, parsedUrl.length).split('?')[0]
   let relPath = curr.substring('./public/files'.length, curr.length)
 

server.js

@@ -32,11 +32,50 @@ const https = require('https')
 const stat = require('./utils/stat.js')
 stat.Load()
 
-const qmining = require('./modules/qmining.js').app
+const loggableKeywords = [
-const main = require('./modules/main.js').app
+  'user.js'
-const sio = require('./modules/sio.js').app
+]
-const stuff = require('./modules/stuff.js').app
+let modules = {
-const old = require('./modules/old.js').app
+  qmining: {
+    path: './modules/qmining.js',
+    name: 'qmining',
+    urls: [ 'qmining.frylabs.net', 'localhost' ]
+  },
+  main: {
+    path: './modules/main.js',
+    name: 'main',
+    urls: [ 'frylabs.net', 'www.frylabs.net' ]
+  },
+  sio: {
+    path: './modules/sio.js',
+    name: 'sio',
+    urls: [ 'sio.frylabs.net' ]
+  },
+  stuff: {
+    path: './modules/stuff.js',
+    name: 'stuff',
+    urls: [ 'stuff.frylabs.net' ]
+  },
+  old: {
+    path: './modules/old.js',
+    name: 'old',
+    urls: [ 'qmining.tk', 'www.qmining.tk' ]
+  }
+}
+
+const app = express()
+
+Object.keys(modules).forEach(function (k, i) {
+  let x = modules[k]
+  try {
+    x.app = require(x.path).app
+    x.urls.forEach((url) => {
+      app.use(vhost(url, x.app))
+    })
+  } catch (e) {
+    console.log(e)
+  }
+})
 
 const locLogFile = './stats/logs'
 const allLogFile = '/nlogs/log'
@@ -93,12 +132,6 @@ function setLogTimer () {
 
 setLogTimer()
 
-const app = express()
-
-const loggableKeywords = [
-  'user.js'
-]
-
 app.use(function (req, res, next) {
   res.on('finish', function () {
     logger.LogReq(req, true, res.statusCode)
@@ -111,17 +144,6 @@ app.use(function (req, res, next) {
   next()
 })
 
-app.use(vhost('qmining.frylabs.net', qmining))
-app.use(vhost('sio.frylabs.net', sio))
-app.use(vhost('stuff.frylabs.net', stuff))
-app.use(vhost('frylabs.net', main))
-app.use(vhost('www.frylabs.net', main))
-
-app.use(vhost('qmining.tk', old))
-app.use(vhost('www.qmining.tk', old))
-
-app.use(vhost('localhost', qmining))
-
 logger.Log('Node version: ' + process.version)
 logger.Log('Listening on port: ' + port)
 

views/stuff/folders.ejs

@@ -65,7 +65,7 @@
 			<%=dirname%>
 		</h1>
 	</center>
-	<a href=<%= "http://stuff.frylabs.net" + prevDir %> > Up one level </a>
+	<a href="<%= "http://stuff.frylabs.net" + prevDir%>" > Up one level </a>
 	</p>
 
 	<table class="maintable">