Merged main & websocket server, refactored libs, image uploads fixes

controllers/pages.js

@@ -24,10 +24,11 @@ router.get('/edit/*', (req, res, next) => {
 		cache: false
 	}).then((pageData) => {
 		if(pageData) {
-			return res.render('pages/edit', { pageData });
+			res.render('pages/edit', { pageData });
 		} else {
 			throw new Error('Invalid page path.');
 		}
+		return true;
 	}).catch((err) => {
 		res.render('error', {
 			message: err.message,
@@ -158,12 +159,13 @@ router.get('/*', (req, res, next) => {
 
 	entries.fetch(safePath).then((pageData) => {
 		if(pageData) {
-			return res.render('pages/view', { pageData });
+			res.render('pages/view', { pageData });
 		} else {
 			res.render('error-notexist', {
 				newpath: safePath
 			});
 		}
+		return true;
 	}).error((err) => {
 		res.render('error-notexist', {
 			message: err.message,

controllers/uploads.js

@@ -41,10 +41,7 @@ router.post('/img', lcdata.uploadImgHandler, (req, res, next) => {
 
 	let destFolder = _.chain(req.body.folder).trim().toLower().value();
 
-	ws.emit('uploadsValidateFolder', {
-		auth: WSInternalKey,
-		content: destFolder
-	}, (destFolderPath) => {
+	upl.validateUploadsFolder(destFolder).then((destFolderPath) => {
 		
 		if(!destFolderPath) {
 			return res.json({ ok: false, msg: 'Invalid Folder' });

controllers/ws.js

@@ -0,0 +1,48 @@
+"use strict";
+
+module.exports = (socket) => {
+
+  //-----------------------------------------
+  // SEARCH
+  //-----------------------------------------
+
+  socket.on('search', (data, cb) => {
+    cb = cb || _.noop;
+    entries.search(data.terms).then((results) => {
+      cb(results);
+    });
+  });
+
+  //-----------------------------------------
+  // UPLOADS
+  //-----------------------------------------
+
+  socket.on('uploadsGetFolders', (data, cb) => {
+    cb = cb || _.noop;
+    upl.getUploadsFolders().then((f) => {
+      cb(f);
+    })
+  });
+
+  socket.on('uploadsCreateFolder', (data, cb) => {
+    cb = cb || _.noop;
+    upl.createUploadsFolder(data.foldername).then((f) => {
+      cb(f);
+    });
+  });
+
+  socket.on('uploadsGetImages', (data, cb) => {
+    cb = cb || _.noop;
+    upl.getUploadsFiles('image', data.folder).then((f) => {
+      cb(f);
+    });
+  });
+
+  socket.on('uploadsDeleteFile', (data, cb) => {
+    cb = cb || _.noop;
+    upl.deleteUploadsFile(data.uid).then((f) => {
+      cb(f);
+    });
+  });
+
+};